Merge pull request #95 from chadlung/master

Make PEP8 happier, remove VIM specific settings