adds about us picture, new copy on features page, fixes email us link
fixes conflicts