Minor code cleanup and removal of unused variable
TST: Minor adjustment to pickling tests for travis-ci
Merge branch 'feature/pickling-work' into develop
Release PyStan 2.5.0.1