[#701] Merged changes with terrell's refactoring of file to use sane variable names and making it safe for resource install for now.  and stuff. yea.
[#701] Merged changes with terrell's refactoring of file to use sane variable names and making it safe for resource install for now.  and stuff. yea.

leesab/irods,PaulVanSchayck/irods,leesab/irods,janiheikkinen/irods,leesab/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,janiheikkinen/irods,leesab/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods,PaulVanSchayck/irods,leesab/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods