Some options can not take a argument. 

Gets rid of the '= true' when an option is set to true. Also, leaves out options when set to false. See Issues #338 and #363