Cleanup, renaming variables, reimplemented running ubm-gmm and ivec in same run.