Roll options back into the file of the same name.

Move the enums and option types back into their main file. (graph_options-> graph)
Re-order enums to ensure the default value is first in the iota list.
Rename builder variables to get rid of the CA suffix.
Clean up some comments

Author: rsned