meh
Merge branch 'master' into Kenneth
fixes and stuff.
tests
derp
Fixed merges and weird other stuff