More changes - add remove location, coffee, user
Merge branch 'master' of github.com:wyne/log