Various OSX and bundler based changes.