Updated file locations so that all of NAS-Pi's files are kept in /usr/share/naspi rather than a home folder.
Merge branch 'master' of git://github.com/gurudigitalsolutions/NAS-Pi

For some reason, I cannot push my changes.  I am attempting to fix that.
Deleting original Apache configuration file.