Midje testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.clj
	src/iceberg/file.clj
Unit testing with midje.