aura refactor
Merge branch 'master' of https://github.com/heroku/force into working

pull master to working
windows fix
windows fix
windows fix
enhance optional directory to handle paths
man merge
Merge branch 'working'

merge manually