Added check for overridden features
Merge branch '7.x-1.x' of https://github.com/vih/vih-build into 7.x-1.x