Merge pull request #595 from jkielbaey/master

Vagrantfile: Install python-configobj package on EL5 and EL6 vagrant boxes.
Merge pull request #596 from jkielbaey/master

Vagrantfile: Add centos6-devel vagrantbox
remove vimrc
Re #449, this removes the special case logic for building rpms from setup.py. It is no longer needed as we have it overridden in setup.cfg.
Merge remote-tracking branch 'upstream/master'