Added support for different types of build files in contrib
Some whitespace cleanup