Update to gitignore (I'm updating this file so often I'm beginning to suspect something is going on...)
Merge branch 'master' of https://github.com/PMEAL/OpenPNM