Battle.js now completely relies on Configuration.js for its data. Also, made many of the set up functions more flexible.
Minor changes
Resolved conflicts