(PE-3025) Begin changing to dev-resources

Leiningen automatically includes dev-resources, so we want
to change over to using it instead of test-resources. However,
there is currently an error in a test that needs to be fixed.
(PE-3025) Change trapperkeeper version

The trapperkeeper-webserver-jetty7 tests were failing, as
the version of TK being used contained a direct reference
to test-resources. The project now uses TK version 0.3.6,
as this is the most recent version that would not cause
the tests to fail.
(PE-3025) Remove extraneous file

Remove extraneous .iml file, which had been added by IDEA.
Merge pull request #8 from fpringvaldsen/change-to-dev-resources

(PE-3025) Change to dev resources