Use AM 4.0.4 rc1
Use 4.1.0.rc1 on 4.1 tests

Also cleanup the gemfile