beginning edits in intro
Delete foss4g-urbansim2-paper.lyx~
Merge pull request #1 from waddell/master

first test of merging edits