1.1.4 prep

Pulled updated from master and did release prep.