Like, REALLY, minor tweaks.
Fixing small regression in #1633
Tweak .gitignore to ignore .yml files in subfolders of app/config.
Merge remote-tracking branch 'origin/master' into issue-1637