Auto merge of #140 - eluciano11:master, r=jpadilla
Auto merge of #140 - eluciano11:master, r=jpadilla

Adds changes from @digia 's original pull request.

jpadilla/ember-cli-simple-auth-token,jpadilla/ember-simple-auth-token,jpadilla/ember-simple-auth-token,jpadilla/ember-cli-simple-auth-token