Remove yankring
update
Merge branch 'master' into macbook_air