Cleaned up hierarchy to use vagrant multi-machine configuration for puppet/chef rather than completely separate paths
Cleaned up ignores
Fixed up puppet configuration
Moved global puppet configuration to machine level (pending https://github.com/mhahn/vagrant-librarian-puppet/pull/8)