Reverted inadverently committed items related to [add-support-for-templates-and-config-files]
Merge pull request #5 from unboxed/bug/fix-merge-issues

Reverted inadverently committed items related to [add-support-for-templates-and-config-files]