Ran through clang++, updated make file to include generic compiler flags.