1.1.4-prep
Merge pull request #128 from mhaskel/1.1.4-prep

1.1.4 prep
Merge pull request #132 from mhaskel/test

merge 1.1.x into master