Ack executable
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Take flx-ido into use

Conflicts:
	home/.emacs
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Change magit status binding to C-c g
  Bind magit status to M-d s
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Need to zero PROMPT_COMMAND too to disable powerline
  No fancy prompt for dumb shells
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Add prefix for magit commands, more magit bindings
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Turn on smart haskell indentation
  Install scala-mode
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Change haskell indent to less smart mode
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  SCM breeze
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Damn broken paste
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Default config file
Don't use Rainbow-Parenthesis vim bundle
Merge branch 'master' of github.com:ilkka/dotfiles

* 'master' of github.com:ilkka/dotfiles:
  Add vim-multiple-cursors bundle