Non feature branches

If you like it then lets keep it, but use it consistently throughout the document.