Adding ignore for gedit files (Linux)
Modifying the pom.xml template because it defaults to building with Scala 2.9.1, but that is broken because BeanProperty moved, so instead use 2.10 as the default but add the option of using Scala 2.11
Reverting these files, they don't need to change
Merge pull request #303 from butlermh/master

Can't run ./bin/scala-petstore.sh as instructed at README