Intermdiate checkin for venue database shiz.
Merge remote-tracking branch 'refs/remotes/origin/master'
Some tweaks to make everything work.