updated web app
twitter queries
code in html files
button change
update
update
Merge branch 'brian' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/fanhype.py
added cron job
updated cron script
xml conversion
bulkloader.yaml added
Merge branch 'master' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/app.yaml
	fanhype/fanhype.py
	fanhype/index.html
prep for merge with will
Merge branch 'william' of https://github.com/Belltron/FanHype into brian
Merge branch 'william' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/fanhype.py
	fanhype/index.html
update