merged in changes from live version

Benjamin Mako Hill || Want to submit a patch?