Fixed an incorrect state error
Fixed an timeout error for waiting Chef node to show up
ignore data.yml
Merge branch 'master' into AERIE