Fixed some bugs, still majorly broken
Merge branch 'highlight' of github.com:GorillaApp/gorilla into highlight