removed @favorites from the show method of users_controller because it used the votable gem
Merge branch 'master' of https://github.com/pocus/mondiale
merged show view for trips
adds inspired_models method to user model that finds all of the trips, chapters or posts the user has added as an inspiration
adds a list of inspirations to the user show page
removes highest_rated scope from model and welcome controller as it is no longer functional
adds inspiration options to the trips form
adds inspirations to the chapter form
changes the way @trip is set