Minor changes
Fixed merge issues
Fixed a bunch of update and delete issues with the DOM
Merge branch 'master' of https://github.com/khalua/travlr