Some clean up and indenting.
Merge branch 'master' of http://github.com/su2code/SU2