remove junk & move left overs
less wat & tests pass
Merge branch 'feature/issue-9-less-wat-please' into develop
working through timezone changes
fixing more datetimes
convert url template tags
use nose and only run txtalert tests
last bit of timezone bits
Merge branch 'feature/issue-8-upgrade-to-django-1.5' into develop
Merge branch 'develop' into feature/issue-7-auto-complete-in-admin

Conflicts:
	requirements.pip
	txtalert/env/settings.py