change syntax highlighting bash => sh
no need for analytics beacon anymore
add note about rebasing a feature branch onto master