Increase history size
Test chpwd function in zsh
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
No rbenv in this branch
Do not start Sublime Text
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
Update SOLR folder
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
Merge branch 'master' into use_rvm

Conflicts:
	zshrc
Fix merge conflicts
Merge branch 'master' into use_rvm
Merge branch 'master' into use_rvm
Fix conflicts in zshrc customizations

Conflicts:
	zshrc