Added shotgun, tidied up and renamed main sinatra file