Merge branch 'deadly_skills'
Added rebase to my list of deadly skills.