Bring a bunch up to date
Missed a few
Merge pull request #4 from manelscout4life/jellybean

Bring a bunch up to date