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