More updates for Linux. Now running on Ubuntu with clang 3.4