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.
add function file.grep
Changing aws to ec2 in docs
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
Remove doc reference to minion
Have runner return event have "return" to be the same as other events
return a dict like other data return events
Add alpha warning for salt-ssh
Merge pull request #8758 from basepi/saltsshwarning

Add alpha warning for salt-ssh
Merge pull request #8755 from pass-by-value/more_doc_changes

Remove doc reference to minion
Changed YAML example to two-space indents