matplotlib configs.
API
API
Merge branch 'master' of https://github.com/tmetsch/suricate
matplotlib configs.
Merge branch 'master' of https://github.com/tmetsch/suricate
Merge branch 'master' of https://github.com/tmetsch/suricate
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO.md