Added Atom packages, cleaned up, added some OSX options.