Updated gitignore, added to .vimrc
Merge commit '0b3598b'
Cleanup