Merge pull request #62 from AaronTR/master

Fixed db conflict issues. ZMQ/GUI changes
Changes for final presentation