If specified, --gpu flag overrides SolverParameter solver_mode.
Merge pull request #961 from jeffdonahue/gpu-flag-overrides-solver-mode

If specified, --gpu flag overrides SolverParameter solver_mode.