Revert "updates from code review"

This reverts commit 00225e8b9c8bb35dac01de154bddd416692168b5.
Revert "retire static cluster properties"

This reverts commit 96b200c2fae79de17f67ef7cc79fe3646910d134.
Revert "ASGARD-1273 adding support for configuring clusters"

This reverts commit 5a69eab3a9592e44b78ff85f24691e62645069ea.
Revert "ASGARD-1273 pump the maximum number of ASGs allowed in a cluster"

This reverts commit b0ce355e700454e7ec428fb13bdb850296994695.
Merge pull request #505 from joesondow/reverse-ASGARD-1273-more-ASGs

Reverse ASGARD-1273 more ASGs
ASGARD-1292 - Configurable AWS API socket timeout

Asgard prod machines are timing out making certain AWS API calls. Increasing the timeout from the default of 50 seconds to a higher value seems to help, so I'm making the socket timeout configurable.
Merge pull request #506 from joesondow/ASGARD-1292-Configurable-socket-timeout

ASGARD-1292 - Configurable AWS API socket timeout