Added .gitignore and modified vimrc dir

Changed vimrc included new .gitignore which prevents files with extensions .cpp and .hpp from being added
Merge branch 'master' of https://github.com/mjArcher/dotvim

Conflicts:
	vimrc

Change to vimrc