fix live in/are in
Merge branch 'master' of github.com:pudo/dataomega
Move all of the tests over to use civomega code (for now)
Merge remote-tracking branch 'pudo/master'
show demographic name as part of the output
int
add a label for pop. type
Merge branch 'master' of github.com:pudo/dataomega
Merge branch 'master' of github.com:pudo/dataomega

Conflicts:
	civomega/modules/census_population.py
	civomega/templates/census/b03001.html
pretty format big numbers
Merge pull request #7 from slifty/master

A few important patches to bill search
format with commas
Merge branch 'master' of github.com:pudo/dataomega
tablesorter for bills
Merge branch 'master' of https://github.com/pudo/dataomega
Remove the extraneous line
First big pass at the README
prettyness.
don't use our contrived test thing as an example now that we have *some* real data sources
Merge branch 'master' of github.com:pudo/dataomega