Merge branch 'stage_one' into stage_two
Fixes.
Now failz on Mac.
Fixed.
Merge branch 'stage_two' into stage_three
Reordered.
Moved stdlib.
Merge branch 'stage_two' into stage_three
Updated structure.
Merge branch 'stage_one' into stage_two

Conflicts:
	manifests/init.pp
Merge branch 'stage_two' into stage_three
Added testing_option.
Merge branch 'stage_two' into stage_three
Renamed.
Merge branch 'stage_two' into stage_three
Finally.
Merge branch 'stage_two' into stage_three
Final update to spec files.
:Merge branch 'stage_three' into stage_boss

Conflicts:
	manifests/init.pp