Updating for Kickstarter.
Revert "Updating for Kickstarter."

This reverts commit 9eabbad157db025015f785f1c9434e6ab1ade0a9.
Merge branch 'master' into yeoman