Merge pull request #1760 from martinholmer/0-14-1

Various updates for release 0.14.1

RELEASES.md

@@ -4,10 +4,10 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap
 for a complete commit history.
 
 
-2017-12-?? Release 0.14.1
+2017-12-15 Release 0.14.1
 -------------------------
 (last merged pull request is
-[#17xx](https://github.com/open-source-economics/Tax-Calculator/pull/17xx))
+[#1759](https://github.com/open-source-economics/Tax-Calculator/pull/1759))
 
 **API Changes**
 - None
@@ -19,6 +19,9 @@ for a complete commit history.
 - Add percentage change in income by income decile graph to `tc --graphs` output
   [[#1758](https://github.com/open-source-economics/Tax-Calculator/pull/1758)
   by Martin Holmer]
+- Add JSON reform file for TCJA conference bill
+  [[#1759](https://github.com/open-source-economics/Tax-Calculator/pull/1759)
+  by Cody Kallen with review by Matt Jensen and Sean Wang]
 
 **Bug Fixes**
 - None

docs/index.html

@@ -36,18 +36,19 @@ <h1 id="doc">Using Tax-Calculator</h1>
 
 <h2>What's New</h2>
 
+<p><a href="https://github.com/open-source-economics/Tax-Calculator/blob/master/taxcalc/reforms/TCJA_Reconciliation.json">TCJA conference bill</a> reform
+file and ability to simulate it is available in Tax-Calculator release 0.14.1
+
 <p><a href="#partdump">Partial Dump</a> capability allows you to
 specify exactly which variables are included in the output file when
-using the <kbd>tc --dump</kbd> option
+using the <kbd>tc --dump</kbd> option (available in release 0.14.0 and
+higher)
 
 <p><a href="#fastexec">Faster Execution</a> tip when executing many
 <kbd>tc</kbd> runs that differ by year and/or reform</p>
 
-<p><a href="#marskids">Filing Units</a> example shows how to specify
-filing units with different marital status and numbers of children</p>
-
-<p>To upgrade to the Tax-Calculator 0.14.0 package, execute this
-command: <kbd>conda update -c ospc taxcalc</kbd></p>
+<p>To upgrade to the newest version of the Tax-Calculator package,
+execute this command: <kbd>conda update -c ospc taxcalc</kbd></p>
 
 
 <h2>Document Contents</h2>

docs/index.htmx

@@ -35,18 +35,19 @@ upon request.</p>
 
 <h2>What's New</h2>
 
+<p><a href="https://github.com/open-source-economics/Tax-Calculator/blob/master/taxcalc/reforms/TCJA_Reconciliation.json">TCJA conference bill</a> reform
+file and ability to simulate it is available in Tax-Calculator release 0.14.1
+
 <p><a href="#partdump">Partial Dump</a> capability allows you to
 specify exactly which variables are included in the output file when
-using the <kbd>tc --dump</kbd> option
+using the <kbd>tc --dump</kbd> option (available in release 0.14.0 and
+higher)
 
 <p><a href="#fastexec">Faster Execution</a> tip when executing many
 <kbd>tc</kbd> runs that differ by year and/or reform</p>
 
-<p><a href="#marskids">Filing Units</a> example shows how to specify
-filing units with different marital status and numbers of children</p>
-
-<p>To upgrade to the Tax-Calculator 0.14.0 package, execute this
-command: <kbd>conda update -c ospc taxcalc</kbd></p>
+<p>To upgrade to the newest version of the Tax-Calculator package,
+execute this command: <kbd>conda update -c ospc taxcalc</kbd></p>
 
 
 <h2>Document Contents</h2>

taxcalc/reforms/REFORMS.md

@@ -35,6 +35,8 @@ The following reform proposals have been specified in reforms files:
 
 - [2017 Tax Cuts and Jobs Act, Passed Senate version](TCJA_Senate_120117.json)
 
+- [2017 Tax Cuts and Jobs Act, Conference bill](TCJA_Reconciliation.json)
+
 ## Structure and Syntax of Reform Files
 
 The reform files are JSON files.  JSON, which stands for JavaScript