updated
Merge branch 'master' of github.com:torkelo/dotfiles

Conflicts:
	sublime/User/GoSublime/linux-x64/log.txt