Merge pull request #75 from alexanderson/master

Added the third graph to pages (plus many merged from other pulls)
added 3rd graph and fixed broken meta
added graph to pulled template updates
- Change client metadata so it's able to accept any number of metadata arguments.
- Add in requirements.txt file to track dependency versions.
- Other little intrusions.
Adding key/value filtering for bar graphs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/static/templates/aggregatecallstacks.html
	server/static/templates/aggregatefileaccesses.html
	server/static/templates/aggregatesqls.html
Merge pull request #76 from dannybutler/master

Adding key/value filtering for bar graphs
Adding composite primary keys to the association tables
Changing default client config

Should now comply with Alex L's recent changes.
Small database fix
Merge pull request #77 from dannybutler/master

Adding composite primary keys to the association tables
Used Mako inheritance in templates

Reduced code repetition significantly in templates.
Merge pull request #78 from dannybutler/master

Used Mako inheritance in templates
Added names to d3 graph axes
Adding basic tabs for bar graphs
Changing default tab
Merge pull request #79 from dannybutler/master

Adding basic tabs for bar graphs
Adding fancy sql look back in
Small fix to line graph circle radius
Merge pull request #80 from dannybutler/master

Adding fancy sql look back in