Fixed jazz hands pry issue
Updated specs with new time stamps
updated travis ruby version to 2.1.2
Fixed merge conflicts