From 45cc624284ceec44a086a67ff5a156233d486520 Mon Sep 17 00:00:00 2001
From: Nikhar Abbas <nikhar.abbas@colorado.edu>
Date: Thu, 5 Mar 2020 13:24:15 -0700
Subject: [PATCH 1/3] Update history, change to markdown

---
 HISTORY.md  | 31 +++++++++++++++++++++++++++++++
 HISTORY.rst |  8 --------
 2 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 HISTORY.md
 delete mode 100644 HISTORY.rst

diff --git a/HISTORY.md b/HISTORY.md
new file mode 100644
index 00000000..961e1871
--- /dev/null
+++ b/HISTORY.md
@@ -0,0 +1,31 @@
+# History
+
+---------------------
+## 2.0.0 - (2020-03-04)
+Admittedly poor versioning since the last release. Lots of updates...
+
+### API Changes
+* Re-org of some functionalities
+    - turbine.load_from_text is now turbine.utilities 
+    - utilities.write_param_file is now utilities.write_DISCON
+* Include flap controller tuning methods and related inputs to DISCON.IN
+* Remove unnecessary control inputs in DISCON.IN (`z_pitch_*`)
+
+### Other changes
+* Updates to floating filtering methods
+* Updates to floating controller tuning methods to be more mathematically sound
+* Generic flap tuning - employ reading of AeroDyn15 files with multiple distributed aerodynamic control inputs
+* Test case updates and bug fixes
+* Example updates to showcase all functionalities
+* Updates to OpenFAST output processing and plotting scripts
+* All related improvements and updates ROSCO controller itself
+---------------------
+## 1.0.1 - (2020-01-29)
+* Major bug fixes in second order low-pass filters
+* Minor bug fixes for pitch saturation and filter mode settings
+* Minor updates in tuning scripts
+---------------------
+## 1.0.0 - (2020-01-22)
+* Version 1.0 release - initial transition from DRC-Fortran with major updates and API changes
+
+
diff --git a/HISTORY.rst b/HISTORY.rst
deleted file mode 100644
index 41f55ad1..00000000
--- a/HISTORY.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-=======
-History
-=======
-
-0.1.0 (2018-01-09)
-------------------
-
-* First release on PyPI.

From 5e9d386b41067982635d841e7364b2efc8ba93c3 Mon Sep 17 00:00:00 2001
From: Nikhar Abbas <nikhar.abbas@colorado.edu>
Date: Fri, 13 Mar 2020 10:50:22 -0600
Subject: [PATCH 2/3] Update requirements to be less specific

---
 setup.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index df6a39f3..737c5aa4 100644
--- a/setup.py
+++ b/setup.py
@@ -31,16 +31,16 @@
 EMAIL = 'nikhar.abbas@nrel.gov'
 AUTHOR = 'NREL National Wind Technology Center'
 REQUIRES_PYTHON = '>=3.3.0'
-VERSION = '2.0.0'
+VERSION = '2.0.1'
 
 # These packages are required for all of the code to be executed. 
 # - Maybe you can get away with older versions...
 REQUIRED = [
-    'matplotlib>=3',
-    'numpy>=1.16',
-    'pytest>=4',
-    'scipy>=1.1',
-    'pyYAML>=5.3'
+    'matplotlib',
+    'numpy',
+    'pytest',
+    'scipy',
+    'pyYAML',
 ]
 
 # Read the docs, one day, so we'll throw it in here!

From 8ac469e416be77515c09ad672e99e26c4558000d Mon Sep 17 00:00:00 2001
From: Nikhar Abbas <nikhar.abbas@colorado.edu>
Date: Fri, 13 Mar 2020 10:50:42 -0600
Subject: [PATCH 3/3] Slight controller commit hash updates

---
 ROSCO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ROSCO b/ROSCO
index d17f9b8c..c1a7593b 160000
--- a/ROSCO
+++ b/ROSCO
@@ -1 +1 @@
-Subproject commit d17f9b8c6e49cf2d27f5661b25bfe952b00d8cd9
+Subproject commit c1a7593b6d5468f90deafcb6abf90c4e6f4b6218