install trailing spaces
Merge branch 'master' of github.com:thomaswelton/dotfiles

Conflicts:
	sublime/User/Package Control.sublime-settings