DEV: various updates from old PR's
DEV: various updates from old PR's

scipy-conference/conference.scipy.org,scipy-conference/conference.scipy.org,scipy-conference/conference.scipy.org,scipy-conference/conference.scipy.org