Updates
Merge branch 'master' of https://github.com/jonmosco/dotfiles

Conflicts:
	vimrc
Update file test against skel files
Merge branch 'master' of https://github.com/jonmosco/dotfiles