Merge pull request #10 from bpotterbaum/master

A few updates
Putting in the tie of a user to the locations they update
Merge pull request #8 from benfalk/master

pulling in new updates