Git branch clean-up

Build is now passing.
Web interface is 100% complete.
Indent the right brace the same as the start of the line where the left brace is.