documentation and code tidying
merge googl-shortener into master with conflict fixes