Cleanup some messy code, fix CommentLoader issue
Merge branch 'dev' of https://github.com/prenderj/trail-app-server into dev