Releasing 1.4
Removing leftover merge conflict
Merge pull request #27 from andschwa/master

Removing leftover merge conflict