fixed a bunch of dumb stuff
Merge branch 'master' of github.com:priestc/giotto