Incremental commit. Changing terms_controller to handle more than one vocab