glossary stuff
fixed conflicts
done
Merge branch 'master' of github.com:cloudify-cosmo/getcloudify.org