2013/05/10, Staging v2.0
Bump to the right version number.
Merge branch 'v2.0' of github.com:mozilla/openbadger into v2.0

Conflicts:
	package.json