refactor package; separate integration from unit / server from client
Makes client integration tests work again
Merge branch 'master' into refactor

Conflicts:
	client/boot.js
	package.js
	server/fileCopier.js
	server/main.js
	smart.json
Merges all changes from master into refactor branch and fixes some things
Merge branch 'refactor'