whoopee
Merge remote-tracking branch 'origin/master'

Conflicts:
	CONTRIBUTING.md
Revert "whoopee"

This reverts commit f280429a43d5df15299db999152d12affba6263b.

Conflicts:
	CONTRIBUTING.md
Merge branch 'master' of https://github.com/TylerBundy/maestro