Fixed alias
Made some modifications to alias and bashrc
Merge branch 'master' of github.com:nox27/dotfiles