Added defaliases
Merge branch 'master' of github.com:manishv/dotfiles

Conflicts:
	emacs/emacs_personal.el
Added new magit, tangotango as theme in terminal mode
Added loading of zenburn
Added tmux configuration
Added ls color configuration
Adding OS specific support functionality and especially copying and pasting from X