fixes bug in mapreduce code which incorrectly merges counters using counter.__or__ and updates parsing logic
fixes problem with multiprocessing pygeoip using file backed db.  now it used memory cache
Merge branch 'master' of github.com:embr/squidpy
stops adding all erroring rows to (None)*len(FIELDS) bin