Added project specific .gitignore and tweak to screenrc
More .vimrc tweaks
Merge branch 'master' of https://github.com/tgjonesuk/home_config

Conflicts:
	conf/.screenrc
	conf/.vimrc