Added amazonaws check
simplified include of machine specific files
Added specific settings
Update .local.amazonaws
Merge branch 'local.amazonaws' of github.com:vrozkovec/dotfiles into local.amazonaws