Add alias for ls
Update Solr bin path
Ignore duplicate commands in history
Merge branch 'master' of github.com:indrode/zsh-custom
Merge branch 'master' of github.com:indrode/zsh-custom
Merge branch 'master' into use_rvm

Conflicts:
	zshrc