Reformat and clean up

As [requested](https://github.com/mohiva/play-silhouette/pull/140#issuecomment-37121977).