Merge branch 'JohnFyffeICEngines' of git://github.com/stanford-energy-journal/transportation-print-version into JohnFyffeICEngines
-F
Merge branch 'ZhangAutonomousMOD'
Merge branch 'AviationArticle'
allset
fixed word wrap
changed textbf to subsubsections
Merge branch 'master' into MiretArticle

Conflicts:
	papertex.pdf
Merge branch 'master' of https://github.com/stanford-energy-journal/transportation-print-version