pre-branch commit
fixed a few things. todo: clean up fabricant.py
Merge branches 'master' and 'nopuppetput'