Updates
Merge branch 'master' of github.com:objectivehtml/language-expressionengine

Conflicts:
	package.json