Squashed commit of the following:

commit 787c261f1d00eb1473dd7933fadac601dcd5e18f
Author: Mike North <northm@yahoo-inc.com>
Date:   Wed Oct 8 00:45:44 2014 -0700

    Update readme to account for #48, #52

commit 0d37e3b91bcd78bde7c0462c3896212444f09fff
Merge: 45a55ee 47d9df3
Author: Mike North <northm@yahoo-inc.com>
Date:   Wed Oct 8 00:42:48 2014 -0700

    Merge branch 'master' of github.com:TrueNorth/ember-cpm

commit 47d9df3d71bc7eff96062756dec5a3e8a69df953
Merge: 96f156b 3c6e9eb
Author: Mike North <northm@yahoo-inc.com>
Date:   Tue Oct 7 09:26:23 2014 -0700

    Merge branch 'main_master'

    Conflicts:
    	dist/amd/ember-cpm.js
    	dist/cjs/ember-cpm.js
    	dist/globals/ember-cpm.js
    	dist/named-amd/ember-cpm.js
    	src/ember-cpm.js

commit 96f156b4ba322d89d0384a0b0034d094f7eb91a6
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 16:49:50 2014 -0700

    conditionalSpec tabs -> spaces

commit 21507e3103fcaa3de56ce65bdefc9f7d5a32e048
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 15:46:39 2014 -0700

    Correct bad renaming of local vars in conditional test

commit 8d09aeab1df9bdbee4044294dc2df6327a58c306
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 15:44:11 2014 -0700

    tabs --> 2 spaces

commit 19bc43a03a4b88758ba3d590e9881099c749469b
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 15:41:31 2014 -0700

    more renaming, to avoid confusion

commit d54d3244c426dff0020c9c3303b38c143d20ebde
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 15:40:05 2014 -0700

    rename ifThenElse -> conditional

commit 52bb398dccf4bf610b3bfc9b94928c7eb1500123
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 15:37:39 2014 -0700

    New and improved ifThenElse, now with composable computed properties

commit 7ec37afa4d11343c79a40817e9c2d4aa6fa33645
Author: Mike North <northm@yahoo-inc.com>
Date:   Sun Oct 5 03:07:33 2014 -0700

    ifThenElse computed property macro