Only run CI on master and production
Merge remote-tracking branch 'origin/master' into travis-ci
Merge remote-tracking branch 'origin/master' into better-fabfile
Added sync command to fabfile
Updated requirements for testing ci
Merge branch 'travis-ci'
Prompting for a choice of merge methods.
Better fabfile :)
Merge branch 'better-fabfile'
This should take care of #1
Merge branch 'better-fabfile'
Added option to specify github issue number.
Merge branch 'better-fabfile' into master  See issue #1
Language
Merge branch 'better-fabfile' into master
Added options for deploy
Merge branch 'better-fabfile' into master; see issue #1
Fabfile improvements
Move deploy scripts into interactive mode
Added merge script to fabfile