refactor Option code
Merge branch '0.7.0-kiama' of github.com:NICTA/scoobi into 0.7.0-kiama