shell:SBT_HOME 제거
JAVA_OPTS, md2docx
dangling object 작업을 위한 reflog-expire alias 추가
git-flow 자동완성 추가
changed-files 추가: diff --name-only
pip cache directory added in the development branch
Merge branch 'shell'

Conflicts:
	zsh/zshrc.symlink
Merge branch 'git'