replaced karma with testem
Merge branch 'master' into pr/292
fix testum to rebuild correctly
Merge pull request #1 from stefanpenner/fix-pr-292

Fix pr 292
Merge remote-tracking branch 'upstream/master' into feature/testem

Conflicts:
	Gruntfile.js
	app/app.js
	karma.conf.js
	package.json
Merge remote-tracking branch 'upstream/master' into feature/testem
Fancy Sprites
Fix
Merge pull request #385 from MajorBreakfast/master

Fancy Sprites (Video :)
Merge pull request #292 from cavneb/feature/testem

replaced karma with testem
upgrade ember
toddy-up start app helper
save resolution
Validate port of development server
Merge pull request #389 from raytiley/port

Validate port of development server
Use absolute paths for dist assets
Merge pull request #390 from rivol/master

Use absolute paths for dist assets
Added autoprefixer, connect-livereload now enabled by default
removed test:server grunt task and added testem config json
Merge pull request #397 from cavneb/issue/392

removed test:server grunt task and added testem config json