fixed typo
added vagrant information
Merge remote-tracking branch 'origin/master'
updated gitignore, added Vagrantfile, bootstrapping file
updated vagrantfile, updated how to build globe
updated readme
updated gitignore, updated karma conf
reverted karma conf
Merge branch 'develop'
Merge branch 'master' into ember-1.2.0
#39 fixed failing test, updated grunt-ember-templates