sqla
Merge https://github.com/brandonjschwartz/boomajoom

Conflicts:
	.gitignore
	README.txt
	boomajoom/__init__.py
	boomajoom/tests.py
	production.ini
	setup.cfg
	setup.py