Here you go
More pythonic way of loading ~/environment.json
Merge pull request #1 from bombela/master

More pythonic way of loading ~/environment.json
added a postinstall script to generate a "test" db.
code cleaning
added template
better error handling
Merge pull request #1 from 3on/master

Latest changes to main repository
increased timeout
Merge pull request #2 from 3on/master

Timeout fix
Handle case of existing database
dotcloud things
dotcloud things
Merge branch 'master' of git://github.com/melissab147/TextToLearn

Conflicts:
	.gitignore
	README.md
	analytics/views.py
	analytics/views.pyc
	myhandlers.py
	rapidsms_tut/__init__.pyc
	rapidsms_tut/settings.py
	rapidsms_tut/settings.pyc
	requirements/base.txt
dotcloud things