tidy like
Merge branch 'master' of https://github.com/steffadams/sample_dev