Fixing some things.
Merge branch 'master' of github.com:larquin/droller