Merge branch 'master' of https://github.com/codeparty/racer into HEAD

Conflicts:
	package.json