rebase etc
Merge branch 'master' of github.com:ianisborn/rmr