Cleaned up imports
Remove testing from fast deploys
Merge branch 'better-fabfile' into master