comitted results of yak hunt
cleaned up conflicts
removed some files that aren't used anymore (renamed)