modified:   vimrc
	modified:   code/Dropbox-Uploader (modified content)
add source tree config
Merge branch 'master' of https://github.com/kuntau/dotfiles