Minor changes to template & switch to bootstrap navbar
Merge branch 'master' of https://github.com/mattmezza/phantom into mattfork/master