after merge fixes
after merge fixes

peebles/stormpath-sdk-node,ck-lee/stormpath-sdk-node,stormpath/stormpath-sdk-node,stormpath/stormpath-sdk-node,peebles/stormpath-sdk-node,robertjd/stormpath-sdk-node,wakashige/stormpath-sdk-node