Update bcrypt
Hook up per year/trip toggle to calculcated cost and cals
Fix journey highlighting