.alias - Organized file and added diff_folder

I tidied up this file a little bit and I also added a new "alias" which
diffs 2 folders and shows the different files only.
Merge branch 'master' of https://github.com/frostyfrog/dotfiles