fleshed out end points and amended travis yml
fixed merge issue