Fabfile improvements
Move deploy scripts into interactive mode
Added merge script to fabfile
fabric console import
Merge branch 'better-fabfile' into master