Merge branch 'f/travis' into develop
 add travis status to readme
Merge branch 'develop' of github.com:spheromak/dhcp-cook into develop
remove unused dep on yajl for spec
fix typo in dev group in berksfile
fix rakefile typo on template checks
Merge branch 'develop' of github.com:spheromak/dhcp-cook into develop
Update for chef11 and fc rule fixes
re-enable FC019
fix FC019 in attribute file
Merge remote-tracking branch 'origin/develop'