Merge branch 'master' into rightscale_array_select
fixing products coffee file
Merge branch 'rightscale_array_select' of github.com:angelamancini/deployer into rightscale_array_select