Merge remote-tracking branch 'origin/develop' into develop
Update readme to cover over-engineering thoughts.
Remove old file.