Merge branch 'master' of https://github.com/rthallisey/packstack

Conflicts:
	packstack/plugins/puppet_950.py
Merge branch 'master' of https://github.com/rthallisey/packstack