move aliases to not conflict with my stuff
Merge branch 'master' of github.com:tinypigdotcom/utility