Fixed import line
Merge branch 'master' of https://github.com/SMAPPNYU/smappPy

Conflicts:
	smappPy/tools/figure_makers/user_tweet_dist.py