changes
added tags to gitignore, added 80-column line marker to vimrc
Merge remote-tracking branch 'origin/master'