commit d27e8edba66f9b9d115af48c824a68c88919499a
Merge: 03b0315 e84ab8c
Author: Element Green <element@elementsofsound.org>
Date:   Mon May 26 01:24:19 2014 -0600

    Not really merging 'master', using ours merge strategy to replace it.
