Refactored ordinal creation and added test cases
Merge branch 'master' of https://github.com/vanda/watbot

Conflicts:
	test_tweets.py