Switched to using play-enhancer
Merge pull request #3022 from jroper/play-enhancer

Switched to using play-enhancer