Merge pull request #689 from extraordinaire/master

[amsterdam 2014] fix proposals listing
Adding some proposals to Pittsburgh
Merge pull request #690 from littleidea/pitt

Adding some proposals to Pittsburgh
[ljubljana 2014] late proposal from Jose Roca