fixed global-* stuff in basic.el
Merge branch 'master' of github.com:numberknight/dotemacs
updated aliases.