first attempt at cfn
update cloudformation
add waithandle
fix template typos
fix apache config