updated .gitignore, edited highlighting in vimrc