Let's try adding some gen-idea
Adding IDE support for IntelliJ, Eclipse, and Emacs to the default plugin set.
Adding the word "Bootstrap" so comment reads "ScalatraBootstrap"
Removing deprecated DefaultSettings.

DefaultSettings is removed in SBT 0.13.2+, see http://typesafe.com/blog
/preview-of-upcoming-sbt-10-features-read-about-the-new-plugins for more
on this.
Updating servlet version in project/build.scala
Merging
Merge pull request #34 from futurechimp/master

Update servlet version and remove deprecated DefaultSettings.