Merge branch 'master', remote-tracking branch 'origin'
Modified fab file to make use of ssh config file
Merge branch 'master', remote-tracking branch 'origin'