Merge pull request #110 from joosthub/master

Make testCSV actually test something
Merge pull request #111 from joosthub/master

More low risk code cleanups. Thanks!
Merge pull request #114 from joosthub/iris_utils

Fix loadIris