Adding changes from @cmosguy for dynamic home dir and swap setup for AWS