Production

dos2unix recursively changed line endings. This should help with merging tremendously.