添加两个交互命令
fix merge
update Rakefile
update vimrc
add bash_profile
add build.sh
Merge branch 'master' of http://github.com/reedboat/my-conf
add abbr
merge