Renamed webqtlTrait.py to trait.py

Renamed webqtlTrait class to GeneralTrait

Began process of removing fd from show_trait.py

Created DatasetGroup object in data_set.py (this may end up becoming
its own file later if it becomes big enough)

2 files changed, 12 insertions, 2 deletions

diff --git a/misc/notes.txt b/misc/notes.txt
index 59ab79cb..b0c0762c 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -14,6 +14,9 @@ export TERM=screen
 To search for commands in history if necessary:
 history | grep "(whatever is being searched for)"
 
+Run web server:
+/usr/local/nginx/sbin/nginx
+
 Run server:
 python runserver.py
 
@@ -63,11 +66,16 @@ Classes should always inherit "object"
 htop: Gives information on processes, cpu/memory load, etc
 dstat: Also gives various system information, resource usage, etc
 df: Reports file system disk space usage
-
+d
 ===========================================
 
 tidyp - Improves/beautifies html code
 tidyp -m -i -w 100 index_page.html
 
+===========================================
+
+ps -ax - View processes
+
+kill (process #)
 
 
diff --git a/misc/todo.txt b/misc/todo.txt
index 609e053f..60655a71 100644
--- a/misc/todo.txt
+++ b/misc/todo.txt
@@ -1 +1,3 @@
-- Read about grep/locate/find
\ No newline at end of file
+- Check about using trait id instead of trait name in queries in data_set.py
+
+- Ask Rob about Probe/cellid traits
\ No newline at end of file