Automated update to Atom config
Ignore Carthage artifacts by default
Merge branch 'master' into laptop