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
Refs #125: Tweak proposal fields

- Make one-line input fields same width on page as text areas
- Make some textarea inputs only 3 rows high
- Limit Objectives to 400 chars
Merge branch 'develop' into staging
Merge pull request #125 from caktus/feature/125-tweak-proposal-fields

Tweaks to proposal submission fields
Merge branch 'develop' into staging
Merge branch 'staging' into production