Use bundler and OS X install notes
Refactor settings