Merge pull request #449 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #452 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #453 from AgileVentures/staging

Pushing Staging to Production
Merge pull request #458 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #459 from AgileVentures/staging

Staging
First cut at using Vagrant for development

I imported and adapted the Vagrantfile and provisioning shell script
from Agile Ventures Local Support. The provisioning script imports the
generic Rails script from AgileVentures/setup-scripts.

This is held together with duct tape and string, but it works, so it is
ready for others to try out. Then we can make improvements based on
experience.
Empty commit to resubmit to Travis CI
Empty commit for travis
Fix typo: ruby version to install is 2.1.1
Merge pull request #477 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #478 from AgileVentures/staging

Pushing Staging to Production
* vagrant-ubuntu-install.sh: rm commented code
trying to assess errors on production
removing debug flag
Merge pull request #466 from dcorking/add-vagrant

First cut at using Vagrant for development
remove flaky javascript time control
remove flaky javascript time control
The timepicker doesn't seem to work right... or maybe we weren't using it right.  However, I haven't been able to get it fail with cucumber, despite following the same steps as in Chrome to get it to fail.  i'm going to go with the default rails helper time/date pickers for now
The timepicker doesn't seem to work right... or maybe we weren't using it right.  However, I haven't been able to get it fail with cucumber, despite following the same steps as in Chrome to get it to fail.  i'm going to go with the default rails helper time/date pickers for now
The timepicker doesn't seem to work right... or maybe we weren't using it right.  However, I haven't been able to get it fail with cucumber, despite following the same steps as in Chrome to get it to fail.  i'm going to go with the default rails helper time/date pickers for now