Templates dir tidied up, options in brocfile are now merged in index.js, and history controller added