Merging part 2.

Changes that seem to be readded:
- Now uses boost libraries. This will need to be added to the makefile.
- Changed table format