cleanup and fixes
Merge branch 'master' of github.com:brownrl/skeleton

Conflicts:
	composer.json