simple updates
Merge branch 'simple_form' of https://github.com/dgrant069/Grubly into simple_form