Merge pull request #1 from dwarduk/makefile

Makefile
Added a couple of .bashrc lines I use
Merge pull request #4 from dwarduk/bashrc_stuff

Bashrc stuff