Revert "Backup on scaffolding idea (should've been in a different branch) (to the public: use commits from today at your own risk!)."

This reverts commit 654bc89f86026da40844295b489471e0261c69ba.
Merge branch 'master' of https://github.com/elycruz/generator-marionette