Update before environment check-- to make sure you get all the branches
Fixing update of repo, it was updating the .git directory, but not the filesystem that is used for the pillar data
Cleanup of branch checkout
Merge branch 'develop' of git://github.com/jacksontj/salt into jacksontj-develop

Conflicts:
	salt/pillar/git_pillar.py