Fixed #121; PyCon US to PyCon in Montreal changes
Merge branch 'develop' into feature/lightning-talk-submission