use -a and -t to opt into things
Merge branch 'master' of git://github.com/Raynos/dotfiles

* 'master' of git://github.com/Raynos/dotfiles:
  exiting is bad >_<
  print sad face when merge conflict
  fix bug
  updated functions