getting rid of extraneous jquery
getting rid of extraneous jquery
removing more extra jquery
Merge branch 'jon' into sprint5
small change to test out SSL
Merge branch 'jon' into sprint5
reference added
Merge branch 'marcia' into sprint5

Conflicts:
	agdrift/__init__.pyc
Merge branch 'jon' into sprint5
Terrplant object completed, need to wire terrplant_model dependencies and testing to the object
Adding Terrplant object back into master, still need to hook into it with model and tests
therps django everything
add new files
Merge branch 'tao' into sprint5
terrplant object working with the input page, will need to add unit test and batching capabilities
Merge branch 'chance' into sprint5
Adding terrplant data object to sprint5 branch, still need to get unit testing, batching, and batch_workers working before complete
Merge branch 'jon' into sprint5