catalog config can be set as annoation in app class, with simpler app creation syntax; and exposed in gui, including booleans in gui
Merge branch 'master' into feature/config-in-catalog-2

Conflicts:
	core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java -- imports only
minor code review comments
Merge pull request #539 from ahgittin/feature/config-in-catalog-2

catalog config can be set as annoation in app class
Merge branch 'master' into fix/locations-typed-keys-and-jclouds-much-nicer
minor fixes, for waiting for SSH machines, and extending the ssh config
some useful utils when extending for subnets