Updating a couple things
Merge remote-tracking branch 'brianegan/master'
Fuck you ftl syntax
Updating a bunch of submodules