Update to 2.18
Merge branch 'update_kv487_2.18' of https://github.com/ksnortum/The-Mutopia-Project
Header tweaks