changes made to get Catami working for Windows dev env. Does not contain Windows path or syntax.
Merge branch 'master' of https://github.com/catami/catami