WIP LightningTalk Proposal Submission bits
resolve merge conflicts
Updates to Lighting Talk Proposal
add lightning talk fixtures
Merge branch 'develop' into feature/lightning-talk-submission
Removing duration field on Lightning Talk Proposal, per feedback on PR #122
Return unicode from __unicode__ methods
Merge pull request #122 from caktus/feature/lightning-talk-submission

PyConLightningTalkProposal Submission
Merge pull request #124 from caktus/feature/124-unicode

__unicode__ methods need to return unicode
Merge branch 'develop' into staging