* Ensure options for formulas `git.latest` are also based on defaults
* Prevent erroneous remote tracking branch modification by `salt.formulas` #238
* Allow multiple envs to use the same gitdir for `salt.formulas`
* Ensure `gitdir` original branch is checked out after formulas `git.latest`
* Fix erroneous comment re: merging in `salt` pillar