Squashed commit of the following:

commit 42b3fa82cd8aae6535a092b2184764bd1bd9c7be
Author: Stefan Buck <stefanbuck@users.noreply.github.com>
Date:   Tue Sep 2 15:09:00 2014 +0200

    Rename variable and fix withespace

commit a94e6cb0281ce4048d653537727ba321b41fbbb7
Author: Stefan Buck <stefanbuck@users.noreply.github.com>
Date:   Tue Sep 2 14:56:46 2014 +0200

    Update test-generated-project.js

commit 5ead21ab6009bd767d3040df025c9f31305ec4a3
Author: Stefan Buck <stefanbuck@users.noreply.github.com>
Date:   Tue Sep 2 14:47:14 2014 +0200

    Run `gulp test` on the generated project