This should take care of #1
Merge branch 'better-fabfile'