Add a dependency on 'six'

In order to support both Python 2.x and 3.x without making too many changes, we
need to use the six library. This change adds the dependency.

Testing done:
- Ran setup.py develop and saw the right packages install.
- Built OSX installer

Reviewed at https://reviews.reviewboard.org/r/6584/