Merge pull request #2 from weakwire/master

More config options
support for play 2.1.2