Cleanup some usage of Option

Signed-off-by: Gary Pamparà <gpampara@gmail.com>
Merge remote-tracking branch 'origin/master'

Signed-off-by: Gary Pamparà <gpampara@gmail.com>

Conflicts:
	src/main/scala/cyborg/util/io.scala