fixed some inconsistencies in AUTHORS across repos
updating ami for ansible-provision
Merge pull request #328 from edx/jarv/deploy

Jarv/deploy
sourcing ascii-convert.sh
Merge branch 'master' into jarv/nginx-refactor