Made some changes to the flavoring of everything.
Merge pull request #51 from cameronklein/FixRevealView

Made some changes to the flavoring of everything.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Cameron