Annotations and Performance Traces

Adds annotation and performance trace support; improves make file such that the package can be built and installed via the make system or setup.py (which is hacked to use the make file).