fix for vertical alignment of 'if (foo ||' in cpp mode
fix off-by-one error in 'moveToPosition'
document 'moveToPosition' behaviour
fix 'enum' indentation case; start consolidating token cursors
corresponding updates in GWT code
disable 'equals' alignment for now (doesn't work as intended)
Merge pull request #254 from rstudio/feature/consolidate-token-cursors

Consolidate token cursor functionality
substitute rsconnect:: for shinyapps::
Merge branch 'master' into feature/library-context-completions

Conflicts:
	src/gwt/acesupport/acemode/r_code_model.js
	src/gwt/test/autoindent_test_cpp.html