Merge pull request PSLmodels#401 from jdebacker/test_demog

Tests for demographics.py

Merge pull request PSLmodels#386 from hdoupe/update-build

Update for version 0.5.+ conda builds

Merge pull request PSLmodels#385 from jdebacker/txfunc_plots

Tax Function Plots

Merge pull request PSLmodels#296 from PeterDSteinberg/fix-pandas

fix numpy and pandas versions

Merge pull request PSLmodels#296 from PeterDSteinberg/fix-pandas

fix numpy and pandas versions

Merge pull request PSLmodels#278 from jdebacker/prod_function

[WIP] Generalize the firm production function

Merge pull request PSLmodels#271 from salimfurth/reform_cleanup2

Fixing error in SS & removing redundancy in TPI

Merge pull request PSLmodels#220 from open-source-economics/fix_user_…

…params

Fix for when user specifies 'g_y_annual'

Merge pull request PSLmodels#219 from talumbau/fix_calibrate

small change to allow calibrate.py to compile

Merge pull request PSLmodels#206 from jdebacker/testing

Representative agent model