Added btt and iterm2 preferences
OSX tricks updated
Merge branch 'master' of http://github.com/gabrielalmeida/dotfiles

* 'master' of http://github.com/gabrielalmeida/dotfiles:
  OSX tricks updated