Mac Update
Merge branch 'master' of https://github.com/steve-thompson/bbv4

Conflicts:
	db/remote_partial/partial.yml