Commit b9e7e2b4e148deb90119d4c2c52d8d9e889527cd

Ben Straub 2012-12-14T13:46:45

Move non-options back out of options struct