Revert to using Vivox SDK 2 on Linux
Typofix
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Fixes, mainly for Clang/Mac, from Cinder.