added aliases; added extraction funtion;
Merge branch 'master' of https://github.com/s-evans/bashrc