add trimming functions
Merge branch 'master' of github.com:dafyddcrosby/dotfiles

Conflicts:
	.vimrc