Modified code to have changes made at Paris Grand Slam 2013 with Simon M. also refactored twitter code to a func
Fixed some bugs