merging with DKs edits
Merge branch 'master' of https://github.com/bwallace/irony-redux