1.1.0 prep
Merge pull request #130 from mhaskel/1.1.0-prep

1.1.0 prep
Merge pull request #131 from mhaskel/test

merge 1.1.x into master