Update vim settings
Remove git-delete-local-merged in favor of git-sweep
Update gitconfig template
Add gopath++
Update sublime settings
Update vim settings
Readd git-delete-local-merged, remove git-sweep