ls is now showing user + group instead of only group
empty_trash is now shorter: "et"
Fixing "locale" error for iterm 2 mavericks.
added sublime
Merge branch 'master' of https://github.com/napcae/dotfiles

Conflicts:
	link/.gnupg/random_seed