Added splice as merge tool
Added lots of stuff
Some tweaks and changes
Moved ssh config to config.local
Merged files
Merged files
Merge branch 'master' of github.com:jkimbo/dotfiles

Conflicts:
	git/gitconfig
	ssh/config