Updates to stuff.
Merge branch 'master' of https://github.com/ozymandias547/stack