checkstyle modifications.  some of this is terrible!!! please forgive
me.
Merge branch 'master' of https://github.com/vancan1ty/programmateurs.git