Removing iml for real this time.
Let's try that again. Apparently intellij uses `git commit --only` to commit individual files, but --only doesn't handle deletions correctly.
Renaming test classes to get maven surefire working.
Target Java 1.7 so that maven builds correctly independent of intellij