Merge pull request #365 from EricWittmann/master

Delete .pom.xml.swp