Fixing some issues with prior merge
small change
small changes to fix remote batching
small changes to app.yaml
iec model description
very small change
Merge branch 'master' into chance

Conflicts:
	app.yaml
	node/mongodb.js
Making changes to node server code, still need to work ubertool batch of size more than one, but not crashing.
Merge branch 'master' into tom
Made changes to rabbitmq interfacing code to get it to the 8th level of callback heck.
small changes to the url in getting the batch config on the user.html page
Merge branch 'master' into chance
Fixed redirect to user.html
moving terrplant_runner to terrplant_batch_runner to make it clearer
Getting rid of TerrPlant.py as it should not exist
Changed name of terrplant_model to terrplant and fixed other problems
Fixed terrplant_batch_runner to point to terrplant as opposed to defunct
terrplant_model
admin.html edits for git
Merge branch 'master' into tom
small clean up of unused code