ignore aws file
ignore config
Merge branch 'master' into onepage