Merge branch 'ember-cli'
Stop using <base> tag

It just causes a world of hurt with our eclectic URLs.