Merge pull request #221 from mballance-sf/master

Updates for the 1.2.5 release
Update for 1.2.6
Doc updates and changes for propagating macro defs