Bootstrap 3.0, small patches.  setup for Vagrant