Rearranged markup so base.jade is in templates and pages are now in the root instead of their own folder.
Replaced dashboard with new grunt-dashboard plugin
updated tests to correctly pass without a dashboard
Updated markup/ to views/ folder
updated views subgenerator to correctly spit out new data comments for grunt-dashboard
Deleted old dashboard files that are now not needed due to the grunt-dashbaord plugin.
Added box-sizing:border-box option to generator
updated grunt-dashboard dependencies.
Updated Changelog and moved old dashboard docs to a docs folder
updated view subgenerator to correctly add in grunt-dashboard comments
removed browserify-shim dependency and configuration.
Updated tests to correctly pass base on new logic.
Updated tasks to run usemin no matter what options are chosen. So now there will always be a vendor.js that gets compiled with a 'grunt build'
Updated karma.conf.js to now include needed dependencies
Fixed scripts subgenerator
Updated bower dependencies
Fixed bourbon paths.
Updated tests to include jquery by default.
Fixed uncss plugin path
Moved Google Analytics above the vendor scripts
Added option for adding modernizr
added logo to repo.
Upped version to 0.5.0
Updated readme and changelog to reflect changes
Merge branch 'dev'

* dev:
  Upped version to 0.5.0 Updated readme and changelog to reflect changes
  added logo to repo.
  Added option for adding modernizr
  Fixed bourbon paths. Updated tests to include jquery by default. Fixed uncss plugin path Moved Google Analytics above the vendor scripts
  Updated bower dependencies
  removed browserify-shim dependency and configuration. Updated tests to correctly pass base on new logic. Updated tasks to run usemin no matter what options are chosen. So now there will always be a vendor.js that gets compiled with a 'grunt build' Updated karma.conf.js to now include needed dependencies Fixed scripts subgenerator
  Deleted old dashboard files that are now not needed due to the grunt-dashbaord plugin. Added box-sizing:border-box option to generator updated grunt-dashboard dependencies. Updated Changelog and moved old dashboard docs to a docs folder updated view subgenerator to correctly add in grunt-dashboard comments
  Rearranged markup so base.jade is in templates and pages are now in the root instead of their own folder. Replaced dashboard with new grunt-dashboard plugin updated tests to correctly pass without a dashboard Updated markup/ to views/ folder updated views subgenerator to correctly spit out new data comments for grunt-dashboard

Conflicts:
	CHANGELOG.md
	app/index.js
	app/templates/Gruntfile.js
	package.json