Fix typo in the options for the debug error handler
Merge pull request #91 from lmullen/master

Fix typo in the options for the debug error handler
fix build on redhat
style ShinyApps-related dialogs; check for package version 0.2.1
use uuid_generate_time
add glib output filter
knit html -> knit; use cmd+shift+k as knit shortcut
change caption to DeployApp
revert to uuid_generate_random
Merge branch 'master' of github.com:/rstudio/rstudio
Merge remote-tracking branch 'origin/master' into feature/rmarkdown-integration

Conflicts:
	src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
	src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTargetWidget.java