Merge branch 'release/v0.11.4'

* release/v0.11.4:
  v0.11.4
  Updated changelog
  Removed unneeded template-spec file for tempalte sub-generator Removed layout block for swig and jade templates with type=layout in the subgenerator
Merge branch 'develop'

* develop:
Merge branch 'release/v0.11.5'

* release/v0.11.5:
  v0.11.5
  Updated comments within base templates (Jade, Swig, HTML)
  Fixed typo
  Updated readme to include info on testing the generator Added `use strict` to lineNumber.js to make it pass jshint
  Removed htaccess file as it was not used. Updated scripts to always have a JSdoc description at the top of the file
  Fixed typo in readme Updated styles for <IE7 warning
  Removed browserify:server tasks from watch as the `watch:true` option handles recompilation.
  Fixed flux tests
  Removing legal stuff that is no longer needed for flux. Updated tests
  Replacing flux dispatcher files and legal stuff with npm module
  Update README.md
  Update CHANGELOG.md
Added `.DS_Store` to ignored files
Added autoprixer task to run on all css to ensure browser compatibility.
Fixed formatting of `_bower.json` file
Formatted spacing for all base templates (jade, swig, html)
Enabled css build comments in all base templates
Fixed issue where css build comments were included with Sass and Less projects when they shouldn't have been
Removed extra call for es5-shims files when using react
Added sourcemaps for css build comment files
Merge branch 'hotfix/cssmin_error' into develop

* hotfix/cssmin_error:
  Fixed formatting of `_bower.json` file Formatted spacing for all base templates (jade, swig, html) Enabled css build comments in all base templates Fixed issue where css build comments were included with Sass and Less projects when they shouldn't have been Removed extra call for es5-shims files when using react Added sourcemaps for css build comment files
  Added `.DS_Store` to ignored files
Added info about linking third-party stylesheets
Added comment to main.css file
Added info on how to fix ftp deployment issues
Fixed issue where css frameworks could not be selected when using CSS
Cleaned up some formatting
Updated fomatting for base templates using regular CSS