* Local changes to fit dev
Merge branch 'master' of git://github.com/creationix/nvm
* adding compile flags
Merge branch 'master' of git://github.com/Wizcorp/nvm

Conflicts:
    nvm.sh