error log commit may 14
Merge branch 'site_fixes' of https://github.com/culturemesh/culturemeshdevteam into site_fixes
stuff from earlier
Merge branch 'site_fixes' of
https://github.com/culturemesh/culturemeshdevteam into site_fixes

There's a phpinfo() call in here, also I was messing around with
the htaccess file, shouldn't be a big deal of a merge.
cm wins images