added global gitignore, updated vimrc
Merge branch 'master' of github.com:lingz/dotfiles

Conflicts:
	.bash_profile
	.vimrc