some basic config
fix bashrc/alias merge error
Merge branch 'master' of github.com:hackrole/hr-linux-conf

Conflicts:
	alias
	bashrc