rsswitch
- Forgot to pull before last commit, this commit fixes some minor
  merge errors.