Merge remote-tracking branch 'origin/master' into better-fabfile
Added sync command to fabfile
Prompting for a choice of merge methods.
Better fabfile :)
Merge branch 'better-fabfile'