Move .ini files into their own (poorly named) folder.
Merge branch 'master' of https://github.com/jcmarsh/Stage
Minor tweaks.