In the middle of a refactor.
Merge branch 'master' of github.com:substance/surface

Conflicts:
	surface.js