Use git rev-parse to get remote for branch

Rather than relying on origin being where branch came from use
git rev-parse to see which remote the branch exists on.
Merge branch '400-vistrail-checkout' into devel-master