Updated .gitignore to ignore vim files
Added the python-dev requisite and .gitignore
Updated .gitignore
Fixed conflicts