commiting changes pre feature
huge step towards converting to ember, still need to migrate barebones templates and start wiring up