working on rebalance page
Merge branch 'master' into chad_cleanup

Conflicts:
	apps/batch/batchRun.py
starting to merge stuff
whatever
starting to merge stuff
Merge branch 'master' into chad_cleanup
starting to merge stuff
Merge branch 'master' of https://github.com/der2127/Rebalancer