Updated both submodules.
Added try-except catch for import error with matplotlylib.

matplotlylib depends on matplotlib... if matplotlib is not installed, a
warning is generated when a user tries to use any matplotlylib
functionality.
Added new packages to setup.py to accomodate the new file structure.