Merge pull request #250 from lowjoel/remove-default-optional-constructor
Use boost::none where appropriate.

(main@97297d7c9281b05faf6c86adb345be739a56246b)