Some small changes with the aim of getting the prototype working today

Signed-off-by: Travis Martin <travis.h.martin@gmail.com>
Merge branch 'master' of https://github.com/Dracir/semicolon