added *.swp to gitignore
Merge branch 'master' of https://github.com/tclose/PyNN