Got rid of the json
Merge branch 'master' of github.com:sontek/horus
Don't install simplejson under Python 3. Use the json package
Fix unicode problem in Python 3.3
Merge pull request #25 from nandoflorestan/python33

Python33
got all tests passing again and removed simplejson
added 3.2 and 3.3 support to travis
make sure pytest is only running on our project
more norecurse matching
added pycache to the norecurse
travis only supports 3.2
hacks for tests in python3
Merge remote-tracking branch 'eventray/master'

Conflicts:
	horus/models.py
added static assets
remove silly statis assets
added static views for horus so that admin works
don't convert date if its not passed
minor bug fix release