Merge from jdong; all testcases should succeed at this point, and all deprecations...
[selectricity] / TODO
1 Known bugs or issues:
2

Benjamin Mako Hill || Want to submit a patch?