Fixed style problems, bandaided cpplint infinite recursion.
Merge branch 'sam_style' into next