minor
setting up tornado
Merge branch 'develop' of github.com:icereval/waterbutler into develop

Conflicts:
	providers/contrib/s3.py
	providers/core.py
Merge branch 'develop' of github.com:icereval/waterbutler into develop

Conflicts:
	providers/contrib/s3.py
	providers/core.py
more cleanup