Using expect instead of should in spec:actions specs (refs #236)
Ensure that #expect is used entirely and disable 'should' for consistency
Merge branch 'develop' of https://github.com/trema/trema into develop