cleaned up fabric env variables, and re-arranged fabric functions such that the main fabric API calls are at beginning of the file, while the rest are alphabetically organized
Merge branch 'v2.0-dev' of github.com:bepetersn/cookcountyjail into v2.0-dev

Conflicts:
	fabfile.py