Only ignore build in top level
Add some stuff to make building rpms easier

Conflicts:
	pkg/rpm/salt.spec
Make buildid a argument
Inverted rules are now recognized for the -A, -s, and -d parameters.
Merge pull request #8547 from ConceitedCode/master

Some inverted rules are now recognized in the iptables module
Merge branch 'develop'
Merge branch 'develop'
Log warning if the grains file cannot be parsed. Refs #8690.
Broader exception handling for invalid options in the salt command. Refs #8016.
Merge pull request #8742 from s0undt3ch/hotfix/jenkins

PEP8 fixes W293 W391(whitespace and extra lines).
add function file.grep
Merge pull request #8731 from cachedout/#8016

Broader exception handling for invalid options in the salt command.
Changing aws to ec2 in docs
Correct inaccuracy in docstring warning message
Merge pull request #8751 from terminalmage/docs

Correct inaccuracy in docstring warning message
adding GCE docs
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge pull request #8752 from erjohnso/develop

Adding docs for new GCE salt cloud support
Merge branch 'develop' of https://github.com/saltstack/salt into awsfix
Adding Getting Started guide for Linode