mmerge branch 'develop'
Merged develop to master.  This will become release 2.0.0
Merged develop to master.  This will become release 2.0.0
Forgot to include new Smack'd feature in Smack'd category.

Will become the actual 2.0.0 release.
Updating develop from master after quick fix to include new Smack'd feature version in Smack'd Update category.  Merge branch 'master' into develop