Small pointless changes
Merge branch 'master' of https://github.com/khalua/travlr
Add some js to the trip form event handlers
Fixed merge issues