add some functions and stuff
Merge branch 'master' of https://github.com/jisaacstone/dotfiles

Conflicts:
	.vimrc