Added a frame for matplot
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev

Conflicts:
	data/connections