Merge pull request #17 from mlevvy/master

Meeting 120
upcoming conferences moved to fron page, removed from partners, cleaned up