Merge branch 'master' of http://github.com/nathanmacinnes/edifice-facade

Conflicts:
	package.json