moving things around, fixing usa
cleanup for canada
Merge branch 'master' of github.com:morgante/travelwatch into emb