Remove some commented-out stuff; Add secure push
Merge branch 'master' into mpv