Better layers in dockerfile. `npm install` doesn't have to rerun now
var now exists in root, not pwd
Merge branch 'master' of github.com:wblankenship/dockeri.co

Conflicts:
	Dockerfile