pageapp.psgi is dev/live specific. Added .gitattributes with merge=ours option.
master branch keeps its own version of pageapp.psgi
updated readme
keep lib to the live version in master