Merge
Add .vimrc
Update .gitignore
Update .vimrc
Add 80 column limit hilighter
Merge branch 'master' into iridium

Conflicts:
	.bash_aliases