Cleared out some leftovers from a bad merge resolution in the stdlib lab.
Merge pull request #358 from insertinterestingnamehere/hotfix

Cleared out some leftovers from a bad merge resolution in the stdlib lab.
Merge branch 'master' into givens