really fixed this time!!!
Merge branch 'master' of https://github.com/jcowhigjr/our-boxen

# By John Cowhig Jr (7) and John (5)
* 'master' of https://github.com/jcowhigjr/our-boxen:
  rm .bundle Puppetfile.lock Gemfile.lock .puppet
  regression
  updated ruby, added some stuff
  skype crash
  bugfix sublime-text2
  added textmate
  updating emacs
  added heroku
  trying to get boxen to remember my sublime_config
  refresh
  fixed nvm by doing /opt/boxen/nvm/install.sh
  added some stuff
still working