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