Remove second locked-in-place toolbar button

Fix for #17, read https://github.com/livereload/livereload-extensions/issues/17#issuecomment-41976963. Also for #28.
fix merge conflict