Do not crash when deleting branches
Whitespace
We don't need load_puppet here, because it's already called by the agent entry point
Let's only update once from git
Merge remote-tracking branch 'hashbrowncipher/update_git_once'

Conflicts:
	agent/puppetupdate.rb