updated to newest versions of external cookbooks
ALM-572 made alm Chef script non-destructive so that it can be used to update alm installations
change template for settings.yml for mail configuration
Add example admin, run in development mode
Merge remote-tracking branch 'upstream/master'

pulling latest commits into cottage labs branch
New index on articles table to speed up retrieval