Merge pull request #285 from insertinterestingnamehere/matplotlib

Fixed a bug in the matplotlib lab. Also changed some code formatting.