Minor cpplint fixes.

- Trailing white spaces.
- Wrong order of files in CMakeLists.
Merge branch 'fix/cpplintWarnings' into 'master'

Minor cpplint fixes.

+1: haizhouW, Vien Tran, Walter Schoen

Merged-on: https://www.assembla.com/code/OpenSurgSim/git/merge_requests/641883