Some fixes for new versions of gems
Change to Bootstrap 3 markup, and some minor code cleanup, much more to do