Merge branch 'master' into leaflet
Fidgeted around a little with mountain show page
changed trips views a bit
Merge branch 'master' of github.com:mskyle/summitup