Anorm cleanup, scaladoc and specs
Merge pull request #2422 from cchantep/anorm-cleanup

Anorm cleanup, scaladoc and specs
Increase timeout used by ning ws spec to fix flapping builds
Merge remote-tracking branch: upstream/master