Merge branch 'master' of github.com:randoum/jasmine-rails into randoum-master

Conflicts:
	lib/jasmine_rails/engine.rb