once again oauth works
Merge branch 'master' of github.com:txsl/hipflask
logout func
Merge branch 'master' of github.com:txsl/hipflask
jquery badassery
Fixed search
Merge branch 'master' of github.com:txsl/hipflask into design
results and topics done
more stuff
Tweepy user stuff done (in theory)
Merge branch 'master' of github.com:txsl/hipflask

Conflicts:
	__init__.py
made links white for video page
Merge branch 'master' of github.com:txsl/hipflask into design
Profile pulls form twitter