Added options for deploy
Merge branch 'better-fabfile' into master; see issue #1