Merge pull request #867 from bridgetkromhout/master

Adding proposal for Minneapolis.