Mainly js/google stuff, intermediate commit to cleanup the colourful mess!
js/google stuff, some cleanup in edit.php and edit.js