cleanup and scaffolding
Merge branch 'master' of https://github.com/amida-tech/blue-button-pim

Conflicts:
	test/artifacts/.DS_Store