Merge pull request #19 from jpsiepert/master

Stuff- crazy stuff really in case we need to revert before this
fixed bugs in setup ctrl
banner fixes