Merge branch 'release/0.2.3' into develop
Merge branch 'master' into develop
meta updates, template cleanup, attrs
bumped version
Merge branch 'release/0.3.0'