Added ack.vim to vim bundles. Fixed bug in cp_r in Rakefile.
Merged with master, fixed conflict in Rakefile.