added gitignore and a number/relative number function
removed that thing that tracks state for vim from the repo
Merge branch 'master' of https://github.com/mbeattie/dotfiles

Conflicts:
	.gitignore
	vimrc