Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

Benjamin Mako Hill || Want to submit a patch?