allow multiple commands per shortcut (for cmd+shift+k)
update keyboard shortcuts documentation
add support for additional code search icons
include cpp definitions in code search
assume CRAN if the repos option is an unnamed vector
update NEWS
Merge pull request #198 from rstudio/feature/cmd-shift-k

Feature/cmd shift k
update news
split code prefs into editing and display
make code indexing pref more generic (not just for R source files)
correct margin for enable code indexing option
add some completion options (space around equals and function tooltip display)
a bit more top padding for dialog tab content
add completion pref (not yet hooked up)
respect completion option in cpp mode
merge from master

Merge branch 'master' into feature/r-autocompletion-tweaks

Conflicts:
	src/gwt/src/org/rstudio/studio/client/workbench/views/console/shell/assist/RCompletionManager.java