Updated my github/twitter info
Fix merge conflict with Samlim's info
Merge branch 'afiune-patch-1'