fixed concat error in twitter handler
Merge branch 'master' of https://github.com/2014DaemonDash/phish-and-microchips

Conflicts:
	Earthly/Earthly/urls.py
	Earthly/Earthly/urls.pyc
	Earthly/TwitterQuery/admin.pyc
	Earthly/TwitterQuery/migrations/0002_auto_20140914_0345.pyc
	Earthly/TwitterQuery/twitterhandler.py
	Earthly/TwitterQuery/twitterhandler.pyc