changes made to configs
update to fix crashing with some assorted locations which fail
cleaned up the repo a bit
Merge branch 'dev'
brought everything over to masteR