Update to aliases, fix gitignore
Merge branch 'master' of github.com:bmoar/desktop