fixes options so it shows credentials correctly
moves a bunch of things around and adds bootstrap
Merge branch 'develop' of github.com:waltzio/waltz into develop