reindex needs to use merge not loc

because it's SO much faster
pep8
Merge pull request #103 from synthicity/merge-not-loc

reindex needs to use merge not loc
Merge branch 'master' of https://github.com/synthicity/urbansim