Updates
merge with thoughtbot
Misc updates
Misc updates