not sure why git 2.0 sucks so much
Merge branch 'master' of github.com:leon13/scotch
more module files and folders