Merge pull request #11 from proppy/master

switch to google/nodejs base image
README: cleanup merge conflict