Take features.yml out of version control.
Add features.yml to gitignore.
Merge branch 'feature-toggling-puppet'