Bump to version 0.11.4 (tagged November 28, 2014).
Fix conflicts.
Merge pull request #2 from michaelahlers/master

Bump to version 0.11.4 (tagged November 28, 2014).