Lock backdrop to a module to a more recent ref.
Fix indenting in backend_app machine definition.
Merge branch 'master' into rails-setup

Conflicts:
	Puppetfile