Git branch clean-up

Build is now passing.
Web interface is 100% complete.