File renaming and other administrivia.
Ensure that unrelated files used as examples during development are separated from the actual tool. They are very useful in their own right though.
Merge remote-tracking branch 'origin/master'