local commit
fix conflict
Update README.md
Merge pull request #5 from xtuple/master

updated read-me
Update README.md
merge
Added auto-update of code
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #7 from xtuple/master

Updated documentation
Npm install for private, if it exists
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'origin/master'
added checks for private repositories
removed npm install
removed timeout
Merge remote-tracking branch 'XTUPLE/master'
changes to support demo install
more changes to support demo
edit to gitignore
removed sync folder