halfway through pstats upgrade
pstats pushed from client
Added database and server changes for accepting pstats
Merged many commits from upstream
Added missing file and changed function configuration
Merge branch 'master' of https://github.com/artsalliancemedia/cherry_pyformance into full-pstats
merged from upstream, fixed bugs
Adding in renamed server config template
Altered gitignore to ignore renamed config
Merge branch 'master' of https://github.com/artsalliancemedia/cherry_pyformance into full-pstats
fixed rename in readme
Merge pull request #85 from alexanderson/master

Client pushes pickled pstats and various merges along the way.