Removed link from main menu, added new twitter (still testing)
Merge branch 'sgchanges'