Van13: Add Michael Collins talk
Van13: close proposals
Merge pull request #565 from stack72/master

More additions to London 2013
Merge pull request #566 from stack72/master

Fixed the formatting of Jeffrey Frederick's talk
Merge pull request #567 from stack72/master

Closing the submissions for London 2013 - only merge on the hour!
[Portland 2013] Spencer Krum proposal
Van13: Added 30min talks to the program
[Portland 2013] Marni Cohen proposal
[Portland 2013] Luke Kanies proposal
Merge pull request #571 from webframp/luke-kanies

[Portland 2013] Luke Kanies proposal
Merge pull request #569 from philwhln/master

Vancouver-2013: Add line-up for 30min talks. Close proposals
Merge pull request #570 from webframp/marni-cohen

[Portland 2013] Marni Cohen proposal
Merge pull request #568 from webframp/spencer-krum

[Portland 2013] Spencer Krum proposal
added Puppet Labs gold sponsorship
Merge pull request #572 from agoddard/portland

added Puppet Labs gold sponsorship
added Jeremy Carroll proposal for PDX
Merge pull request #573 from agoddard/portland

added Jeremy Carroll proposal for PDX
fixes 404 caused by ?
Merge pull request #574 from agoddard/portland

fixes 404 caused by ?
Van13: update OpsWorks talk abstract