Accept improvements submitted by Ruth

commit 7b0e0778c81642384a403576a6807ca1eba817c2
Author: Nathan Lisgo <nlisgo@Nathans-MacBook-Air-2.local>
Date:   Wed Nov 13 12:22:35 2013 +0000

    Remove references to ruth-vagrant-fixes branches of external repos

    Changes have now been brought into the respective master branches of these external repos

commit d90d892ead6428b7d0ae9d539c419cc99edb7ca5
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 8 16:46:12 2013 +0000

    Add GUI version of vagrantfile: rename to use

commit c47a3b46706c119fe06fbd595c3eb369be79870e
Merge: a3d498e 5c2e4eb
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 17:36:16 2013 +0000

    Merge branch 'ruth-vagrant-fixes' of github.com:elifesciences/elife-vagrant into ruth-vagrant-fixes

commit a3d498ef6f203ddb8f916c742ac10eb3028a74c5
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 17:35:58 2013 +0000

    configure for virtualbox, undo comment-out of site recipe & cdn

commit 23d31019238ada4cffc4d6982708294e53eda308
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 17:35:02 2013 +0000

    dont include apache2 cookbook twice

commit 5c2e4eb39dba8622e19f3ed82fea242ed8917bdf
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Nov 1 16:42:02 2013 +0000

    removed duplicate call to apache2 cookbook

commit 8078039d6d9b51cee8621b0442c865602966a098
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 16:29:49 2013 +0000

    fix typo in git

commit 6f49c6c78c0807b1d4fa2d9148c33adeeeed7fe3
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 16:22:22 2013 +0000

    use ENV not inline keys; log info by default

commit 2058a80d50ada65bdb62c85af2b59d4768be7d56
Merge: 16de93a 5f666a7
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 14:50:57 2013 +0000

    Resolve conflict

commit 16de93ad27b65b986266364a31236cbf363a3f8e
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 14:48:27 2013 +0000

    note origin of phpmyadmin; comment both boxes out so force to choose...

commit 6c535f57e4af99cffccea7cac4200425008a8e87
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 14:10:57 2013 +0000

    config.* params are global; reorganise boxes

commit 1d0580dcecd019b3c0121474cbf936e5f09dcc7e
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Fri Nov 1 12:29:57 2013 +0000

    Various updates to vagrant

commit 5f666a7088cf012eb9bebaf688f2accffb663f32
Author: Ian Mulvany <ian@mulvany.net>
Date:   Wed Oct 30 10:47:01 2013 +0000

    added in Vagrantfile with aws placeholder provisioning information

commit 8bcf714170a6c528d2948e18082c5d66b40b4215
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 29 14:55:10 2013 +0000

    updated aws in VF; updated jnl script

commit 65faffd3e6119d71a21d803877196c5e5798202a
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 29 14:55:10 2013 +0000

    updated aws in VF; updated jnl script

commit 43ae6b1322b03d6e32507d2a6e140ee426cf509f
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 23:59:43 2013 +0000

    rename keys to be valid

commit f2676d48060474091ee9753de660671962fafd7c
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 23:51:19 2013 +0000

    enable configure of site file revisions

commit fa4da592e42fc37f86558d68ff5d113579a6d7ec
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 23:50:20 2013 +0000

    enable configure of site file revisions

commit f4691c1b8900e1f03a5088c7f53c5960c258bde1
Author: Ian Mulvany <ian@mulvany.net>
Date:   Mon Oct 28 22:53:03 2013 +0000

    added aws as provisioner to Vagrantfile

commit 632ad3c023dd24c6e926b10ab08ac104365b8436
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 16:21:33 2013 +0000

    jnl FE update

commit e685fd28565d001505381f3b493341c0c1254daf
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 16:21:33 2013 +0000

    jnl FE update

commit 20b98de71ba70ad9e41a53c18d94b3666ea83890
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 15:47:12 2013 +0000

    beginnings of front-end

commit 32fbf9f424ad796ada998bd0e76ee0e4b5ff41b8
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 15:47:12 2013 +0000

    beginnings of front-end

commit 5353c791a239a9b3eb76a1fde9005b734eca07fc
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 15:45:20 2013 +0000

    move roles to recipes in elife-drupal-cookbook and update vagrantfile and cheffile to suit.

commit 44197bb477bdd6b1a587f2a9af62f1d11f33dc1d
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 28 15:45:20 2013 +0000

    move roles to recipes in elife-drupal-cookbook and update vagrantfile and cheffile to suit.

commit 24411113832672d15de011bae3d3dc32796ad347
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Thu Oct 24 12:01:04 2013 +0100

    add a varnish-less role

commit 9551336552b8224a45bab9fb8bcc5a6ef51f53a8
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Thu Oct 24 12:01:04 2013 +0100

    add a varnish-less role

commit 31c828cf07d353c710eb4c09c3facce51715355f
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 16:19:56 2013 +0100

    No longer need drupal_apps or apache_backend, reorder roles slightly.

commit 40a80935d0939418d7aced19b5b7ed850cfef80a
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 16:19:56 2013 +0100

    No longer need drupal_apps or apache_backend, reorder roles slightly.

commit 3f1f20ebbf07b50e0fbc3501c54b8c8daafacf0d
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 14:07:32 2013 +0100

    abandon hosts key; add in site_ports and site_aliases

commit b702b79958ec036345ca14087ab9cdd3b8889d2f
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 12:25:21 2013 +0100

    Improve readme docs. Changes for multiple port apache. Comment the various parameters.

commit c6ae7e74ec1acba069a72f3f7b1c92aade266e48
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 12:25:21 2013 +0100

    Improve readme docs. Changes for multiple port apache. Comment the various parameters.

commit 957dc194969c2259d257917c305d7054be3a8aac
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Wed Oct 23 10:05:53 2013 +0100

    include recipe for disabling cdn

commit 65088dedfd5118f48b07de2e6b7776a53ce2fe62
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 22 14:34:25 2013 +0100

    parameterise json further, note about openvpn

commit 32af81ebca58b44416c41a97207181ffa7a51109
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 22 14:34:25 2013 +0100

    parameterise json further, note about openvpn

commit 738cdca8df0dd196aceee3822dcab87bf52461fa
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 22 11:27:32 2013 +0100

    add drush:head recipe to get recent drush implementation

commit fd429d1befb75254ae9d5d1cfc3219cde662aeb2
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Tue Oct 22 11:27:32 2013 +0100

    add drush:head recipe to get recent drush implementation

commit 6e0a00679cf9ef7b9afe61961cb3a7257af8a4da
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 21 10:15:40 2013 +0100

    fixes

commit 40e2d11a5dcd8359da92b1adef463c87a5750d81
Author: Ruth Ivimey-Cook <r.ivimeycook@elifesciences.org>
Date:   Mon Oct 21 10:15:40 2013 +0100

    fixes

commit e589308f379470e7d34545706d33cf21fdfbc4ac
Author: David Moulton <d.moulton@elifesciences.org>
Date:   Fri Sep 20 16:33:18 2013 +0100

    Add public directory with a note re its mapping in the vm

commit b9893bd953c897c169b81aa9bd4a6adc9af8e8f5
Author: Ian Mulvany <ian@mulvany.net>
Date:   Mon Sep 16 15:10:22 2013 +0100

    point to dev versions for some cookbooks

commit e3ee0f4c9f2735603fc7c186c2cfb0cb3528ad0d
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 16:27:11 2013 +0100

    updated TODOs on README

commit 315cedeaf25028407e9224097c89a42f35d07356
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 16:25:57 2013 +0100

    instructions on how to add the required base box

commit 6373e491a3e345c743ecea58f1333e56b5ba24d5
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 16:22:58 2013 +0100

    points to local copies of drupal recepies

commit f511580bab17ede5ee48111ccb4d0ff7742a0f2d
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 15:36:24 2013 +0100

    added link to vagrant drupal proejct, and some context

commit 82be7278280dac67f135d83992625e97e000fc9d
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 15:21:15 2013 +0100

    added TODO section

commit 9e6154a46573763048ac462fe7667ac8ad0e7906
Author: Ian Mulvany <ian@mulvany.net>
Date:   Fri Sep 6 15:13:26 2013 +0100

    inital outline of deploy repo