Delete config.yml
Merge branch 'master' into bootstrap3/darryn