removing extraneous files from repo and added .gitignore
resolving merge conflict
cache user facing db queries
log on cache miss
Merge pull request #1 from paddycarey/master

Cleanup repo/memcache