Merge branch 'master' of github.com:Bruce-Connor/aggressive-indent-mode