Fixes #5

Not ready for merging. Here for review. See #5 and https://github.com/yeoman/yo/pull/167. Better ideas are welcome!