merging upstream
removing vim file and tweak gitignore
adding myself to CONTRIBUTORS.txt
Merge pull request #26 from iGivefirst/master

Adding myself to contributors and tweaking .gitignore