Merge pull request #356 from cloudedge/pull-req-master-a5cef33661485f12205db574632537726a51de3b

merge and move towards the new world...
Merge pull request #357 from cloudedge/pull-req-master-044a3cebe68ea1c7a6b175bfd6b1c59b3e84cb35

merge and move towards the new world...
update documentation formatting info
add barclamp type
cleanup complaining tests