Merging in old fixes for no newline at end of file loop prevention and some minor default setting tweaks.
Merging in old fixes for no newline at end of file loop prevention and some minor default setting tweaks.

atoulme/Saikuro