Remove tabs from CMakeLists.txt
Remove requirement on UglifyJS

If its available use it, otherwise simply use CMake
to can the js files together.
Consistent 2 spaces for new code

Should fix others as well as a separate branch probably
Merge remote-tracking branch 'origin/remove-uglifyjs' into next

* origin/remove-uglifyjs:
  Consistent 2 spaces for new code
  Remove requirement on UglifyJS
  Remove tabs from CMakeLists.txt