Merge pull request #70 from openwhisk/develop

Merge develop to master, then flatten branch structure