Whitespace fix
Remove old commented out code
Merge branch 'github-bbbscarter-master' into develop
Bump version 1.6 -> 1.7
Merge branch 'develop'