Merge branch 'refs/heads/dev'

* refs/heads/dev:
  Finally fixed problems with bundle install on OS X. Changed to use debugger gem instead of ruby-debug.