- fix if statement braces
- remove async tests when the test isn't async
Bump package.json version
Update _Gruntfile.js

Thanks to @iepathos for this fix. @trombom we should have a test that would have caused this to fail.
Merge branch 'master' of github.com:walmartlabs/generator-thorax into almond-production

Conflicts:
	app/templates/_Gruntfile.js

- The conflict was in _Gruntfile.js. The change had been previously made
  in app/templates/seed/tasks/options/styles.js (same change)
- An updated regression test also exists for the issue
  on line 395, 409 & 423 of test/test-creation.js
- Both changes were made in #39 (the most over bloated issue of all time)
add comment to top of Gruntfile.js
Merge pull request #39 from walmartlabs/almond-production

use almond/requirejs in production(#13, #4)

Merging to allow more great stuff in the pipeline that depends on this. Hate me or love me, I hope the later :)
Merge pull request #50 from walmartlabs/enable-thorax-inspector

Enable thorax inspector
remove comment added to _Gruntfile.js, isolate source of error