added git ignore for os files
removed addons and added Mandrill; Added AWS env vars and added/changed other defaults