ignoring all init files and master/initial
Merge branch 'master' of github.com:pyfarm/pyfarm-master