add OSX and iterm2 includes, move user.js to the new firefox_profile directory