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

Conflicts:
	pkg/rpm/salt.spec
Make buildid a argument
Merge branch 'rpm_build_helper' of git://github.com/mbirtwell/salt into mbirtwell-rpm_build_helper

Conflicts:
	pkg/rpm/salt.spec
Minor clean up on convenience rpm building function