Added my_configs
Merge branch 'master' of github.com:Jerph/vimrc

Conflicts:
	.gitignore