Fix bad twitter link
Removed conflicts
Merge branch 'joekarl-master'