locations generator now fully configurable
updated gitignore
old update of analysis.r