Add matplotlib to dependencies
Merge branch 'project-layout'
Do not import package in setup.py

Reason: this breaks if not all required packages are installed.