All changes were untracked; amended .gitignore to take account of themes
Merge branch 'master' of https://github.com/julianmack/magento