removed modalbox in favor of tour.js
integrated trip.js and upgraded many views
cosmetic changes to profile view
fixed merge conflicts