Add missing hotkey handler
Merge pull request #230 from lotrfan/hotkey_fix

Add missing hotkey action
Remove content when an article is dismissed
Fix incorrect function name in exception handling
Add some checks to see if the content element exists

This *might* help dismissal not break when not using combined mode.
Merge pull request #233 from lotrfan/dismiss

Remove content when dismissing
fix 2week catchup parameter
make floating title less cpu intensive
Merge branch 'dismiss'

Conflicts:
	js/viewfeed.js
Merge remote-tracking branch 'upstream/master'