Formatting things perhaps.. might undo later
Merge branch 'derpy' of git://github.com/KittyTristy/scrib