update for phoenix master / elixir 0.15.0