style edits
Merge branch 'cas' of https://github.com/atticus88/MediaCloud into cas