new login
other stuff
hoo haa
Merge branch 'master' of https://github.com/2014DaemonDash/phish-and-microchips

Conflicts:
	Earthly/Earthly/__init__.pyc
	Earthly/Earthly/settings.pyc
	Earthly/Earthly/urls.pyc
	Earthly/Earthly/wsgi.pyc
	Earthly/TwitterQuery/__init__.pyc
	Earthly/TwitterQuery/admin.pyc
	Earthly/TwitterQuery/migrations/0001_initial.pyc
	Earthly/TwitterQuery/migrations/0002_auto_20140914_0345.pyc
	Earthly/TwitterQuery/migrations/0003_auto_20140914_0807.pyc
	Earthly/TwitterQuery/migrations/0004_tweet_hashtags.pyc
	Earthly/TwitterQuery/migrations/__init__.pyc
	Earthly/TwitterQuery/models.pyc
	Earthly/TwitterQuery/twitterhandler.py
	Earthly/TwitterQuery/twitterhandler.pyc
	Earthly/TwitterQuery/views.pyc
	Earthly/dbhandler.pyc