added wildcard to vendor dir in .gitignore
Merge pull request #108 from adsmit14/ignorefix

Added wildcard to vendor dir in .gitignore
add a grunt-contrib-sass option
Merge pull request #121 from kagemusha/master

add a grunt-contrib-sass option since grunt-sass only allows SCSS style
Compile SASS files with .sass extension, not just .scss
Merge pull request #125 from mbixby/master

Compile SASS files with .sass extension, not just .scss
What may appear to some to be more idiomatic.
But works only due to a quirk in Ember.Router
Perform tasks based on available NPM packages
Extract loadConfig from Gruntfile into tasks/helpers.js
Update README.md (punctuation, grammar, more formal language)
Merge pull request #131 from mbixby/feature/readme-update

Update README.md (punctuation, grammar, a bit more formal language)
Add support for Compass
Merge pull request #133 from mbixby/feature/compass

Add support for Compass
Add Emblem.js
Conflicts:
  Gruntfile.js
Merge pull request #132 from mbixby/feature/emblem-support

Close #130 Add support for Emblem.js
fixes #119

add a grunt-contrib-sass option
Merge pull request #122 from twokul/master

Support standard CSS
Merge remote-tracking branch 'eak/master'

Rework global keyboard shortcut to actually work.

Conflicts:
	app/app.js
	app/router.js