minor fix to shift feature spec
travis to heroku
fix merge confligt
better code style: parens