Merge branch 'dev' of https://github.com/BenCoDev/twitter-harvest into dev

Conflicts:
	twitter-harvest.py