Fix some paths.
Don't need www anymore.
Fix merge conflict.
Merge pull request #1 from bendiy/master

Working from one repo.
Merge pull request #1 from xtuple/master

Catch up.