add check_positive_finite with tests
replace check_positive and check_finite with check_positive_finite
fixed missing using statement
add missing include
removed confusing 'Error in function' from exceptions
fix merge conflict
removed .orig file
Merge branch 'develop' into feature/issue-800-check-positive-finite
Merge pull request #814 from stan-dev/feature/issue-640-update-error-message

removed confusing 'Error in function' from exceptions
Merge branch 'develop' of https://github.com/stan-dev/stan into feature/issue-771-ode-solver
Merge pull request #809 from stan-dev/feature/issue-800-check-positive-finite

Feature/issue 800 check positive finite
Merge branch 'develop' of https://github.com/stan-dev/stan into feature/issue-771-ode-solver
Merge branch 'feature/issue-771-ode-solver' of https://github.com/stan-dev/stan into feature/issue-771-ode-solver
removed needless includes in parser tests