updates
Merge branch 'master' of https://github.com/empaisley/Stuff
Merge branch 'master' of https://github.com/empaisley/Stuff
Merge branch 'master' of https://github.com/empaisley/Stuff
updates