Edits, removing function section
Merge branch 'master' of https://github.com/slbird/pacora-isca-2013

Conflicts:
	modeling.tex
Merge branch 'master' of https://github.com/slbird/pacora-isca-2013