fixed stuff
Merge branch 'master' of https://github.com/sendwithus/sendwithus_wordpress
Merge branch 'kyle'
Merge branch 'master' of https://github.com/sendwithus/sendwithus_wordpress
Added global definitions, some code cleanup and variable name changes in multi/single site code for consistency
Merge branch 'master' into kyle