Merge branch 'edge' of github.com:hyperstack-org/hyperstack into edge

Author: catmando

install/rails-webpacker.rb

@@ -9,7 +9,7 @@
 # ----------------------------------- Add the gems
 
 gem 'webpacker'
-gem 'rails-hyperstack', github: 'hyperstack-org/hyperstack', branch: 'edge', glob: 'ruby/*/*.gemspec'
+gem 'rails-hyperstack', '~> 1.0.alpha' # github: 'hyperstack-org/hyperstack', branch: 'edge', glob: 'ruby/*/*.gemspec'
 
 gem_group :development do
   gem 'foreman'

readme.md

@@ -1,8 +1,8 @@
 # Hyperstack
 
-This is the edge branch - for current status on development see [current status.](https://github.com/hyperstack-org/hyperstack/blob/edge/current-status.md)
+[![Build Status](https://travis-ci.org/hyperstack-org/hyperstack.svg?branch=edge)](https://travis-ci.org/hyperstack-org/hyperstack)
 
-Visit the legacy branch for the current stable and released Hyperloop (old name) system. [![Build Status](https://travis-ci.org/hyperstack-org/hyperstack.svg?branch=hyperloop-legacy)](https://travis-ci.org/hyperstack-org/hyperstack)
+This is the edge branch - the system is stable, and there are approx 1000 test specs passig.  For current status on development see [current status.](https://github.com/hyperstack-org/hyperstack/blob/edge/current-status.md)
 
 Hyperstack is a Ruby-based DSL and modern web toolkit for building spectacular, interactive web applications fast!