more changes
Merge branch 'master' of https://github.com/hypebeast/dotfiles

* 'master' of https://github.com/hypebeast/dotfiles:
  vimrc and more changes
change Rakefile and vim config
Merge branch 'master' of https://github.com/hypebeast/dotfiles

* 'master' of https://github.com/hypebeast/dotfiles:
  add ack config, new rake task and some other changes

Conflicts:
	zsh/zshrc.symlink