Add missing ||
Trivial changes
assertion_proc should be non-nil
Use ruby 2.1.2 on travis-ci.org