Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity

Benjamin Mako Hill || Want to submit a patch?