Fixed problem w/ deceleration

It would occasionally get to near zero, but not actually zero
Merge pull request #167 from BU-CS673/Canfield-Staging

Canfield-Staging -> production
Merge pull request #174 from BU-CS673/production

Update my Chennan branch