cleaned up git stuff around merging plugin