Removed a redundant flag from CXXFLAGS.
Replaced repeated rules with variables.
Got one annoying warning to disappear by removing a redundant part of
the compilation.
Merge branch 'master' into tests
Brought in some nice additions to compilation and linking rules and
such.