ignore init_.pyc
Merge branch 'chance' into tao
AgDrift: Collapsible tables; Terrplant: section id fix for collapsible tables
stir algorithms and sip django
Probably should have done this on my branch but nothing should cause conflicts
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5
Cleaning up node.js
small changes to get CAS data workingin mongo locally and on AWS
Switching AquaticToxicity data and pages to use Node.js-based REST interface to MongoDB on AWS
Switching AquaticToxicity data and pages to use Node.js-based REST interface to MongoDB on AWS
stir algorithm
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5
Merge branch 'marcia' into sprint5
Node-based AquaticToxicity REST service working completely, still need to replicate with rest of Ubertools configuration.
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5

Conflicts:
	agdrift/__init__.pyc
Merge branch 'chance' into sprint5
Getting ubertool configuration information REST Service working on local node server, still need to test on AWS
Getting ubertool configuration information REST Service working on local node server, still need to test on AWS
trex2 batch
add trex2 batch (git commit -a does not include git add -all)