Updated maven compiler to 3.1

(3.0 was a bit buggy!)
Removed stuff accidentally added to choice.xml