merge atom config
Merge branch 'holman-master'