Run fixes from runningwild#1

Open

nife2o4 wants to merge 5 commits intomasterfrom

Commits on Nov 19, 2012

Revert "Finally moved Choose2 -> Choose and Map2 -> Map"
nife2o4
committed

Commits on Nov 20, 2012

changes
nife2o4
committed

Commits on Dec 5, 2012