Stupid #?!@ing merge mistake put ^M characters after every line.
Still pesky marge mistakes. Removed lots of duplicated lines