"guie" should be "guide"
Merge pull request #156 from chadfennell/master

minor nit -> "guie" should be "guide"
Replace the deprecated 'linkTo' helper with the recommended link-to helper
Merge pull request #157 from dunnkers/master

Replace the deprecated 'linkTo' helper with the recommended link-to helper
upgrade ember-data-shim to 1.0.0.beta.4
Merge pull request #158 from nicolai86/master

upgrade ember-data-shim to 1.0.0.beta.4
remove compass dependency when user does not want compass. Fixes #98.
Merge pull request #150 from smackesey/fix_compass_installation

remove compass dependency when user does not want compass. Fixes #98.
Ember 1.3.1 upgrade - security critical, ED to beta.5
deprecate grunt server
Merge pull request #160 from eddiemonge/server

deprecate grunt server
Merge pull request #159 from knownasilya/ember-security-update

Security Critical: Ember 1.3.1 upgrade, ED to beta.5
Update .travis.yml