Clean up configs & reorganize to use thoughtbot/rcm for management