Overrides should override?
Merge remote-tracking branch 'upstream/master' into overrides-should-override
Call views modules (push travis)
Merge pull request #39 from matthew-andrews/overrides-should-override

Overrides should override