Merge pull request #76 from dannybutler/master

Adding key/value filtering for bar graphs
Merge pull request #77 from dannybutler/master

Adding composite primary keys to the association tables
Merge pull request #78 from dannybutler/master

Used Mako inheritance in templates
Merge pull request #79 from dannybutler/master

Adding basic tabs for bar graphs
halfway through pstats upgrade
pstats pushed from client
Merge pull request #80 from dannybutler/master

Adding fancy sql look back in
Merge pull request #81 from dannybutler/master

Changed server/client side config files
Added database and server changes for accepting pstats
Merged many commits from upstream
Added missing file and changed function configuration
Merge pull request #82 from dannybutler/master

Fixed sorting bug
Merge branch 'master' of https://github.com/artsalliancemedia/cherry_pyformance into full-pstats
Merge pull request #83 from dannybutler/master

Whoops
merged from upstream, fixed bugs
Adding in renamed server config template
Altered gitignore to ignore renamed config
Merge pull request #84 from dannybutler/master

Adding Alembic stuff
Merge branch 'master' of https://github.com/artsalliancemedia/cherry_pyformance into full-pstats
fixed rename in readme