Build Repaired: Changed file-ending to .cc for make to work; enabled
C++11 mode in Makefile; fixed some small compilation errors and
dependencies that came in with refactoring
System tested