Uhmm. npm publish --tag beta somehow published to latest. Not a fan.
Merge branch 'master' into Jasmine2.0

Conflicts:
	package.json