forgot heroku gets confused with this
Merge branch 'master' of github.com:brycedorn/jQuery.minitranslate

Conflicts:
	npm/package.json