add a few packages to see if we can get builds working standalone
synnnnc
Ignore VIM's noise
Merge branch 'master' into automation

Conflicts:
	.gitignore
ignore some build artifact directories too.
Merge remote-tracking branch 'b/master'
Merge branch 'master' of https://github.com/arrjay/rpm

Conflicts:
	buildsystem/incremental.py
	buildsystem/mksrpm.py
	buildsystem/mock/logging.ini
	buildsystem/mock/palantir-5-x86_64.cfg
	buildsystem/mock/palantir-6-x86_64.cfg
	buildsystem/mock/palantir-7-x86_64.cfg
	buildsystem/mock/site-defaults.cfg
	buildsystem/rpmmacros/default
	buildsystem/rpmmacros/el5
	buildsystem/rpmmacros/el6
	buildsystem/rpmmacros/el7
	buildsystem/rpmsign.exp
Merge branch 'master' of file:///home/rjlocal/repos/rpm-buildsystem