auth
merging master
merge master
merging master again
i really love maintaining this branch.  so awesome.
Merge remote-tracking branch 'origin/master' into auth-rails-4

* origin/master: (77 commits)
  Remove migration reference to ClientReader
  Remove migration that renames indicies
  makes docs route work
  Remove default on settings table column editable
  Remove limit on settings table value column
  Run rake db:migrate from scratch
  Remove problematic migration
  adds button to docs page
  Switch spec email addresses to generic examples
  Add bin/bundle bin/rails bin/rake
  fixes web_template_spec
  fix broken specs
  use g5-neighborhood in client reader
  Use asset-url instead of url in scss
  Add condition to wildcard route
  Run rake db:migrate
  Fix error when migrating
  adds neighborhood to spec support
  Remove try and fix specs by reordering let!s
  Add guard-rspec back
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
Merge remote-tracking branch 'origin/master' into auth_redux

* origin/master:
  makes private spec pending - pending actual private widget
adds logger
Merge remote-tracking branch 'origin/master' into auth_redux

* origin/master: (22 commits)
  Fix specs to use deep linking
  Add WebsiteIndexController
  Rename WebsiteIndexController to expected WebsiteController
  Revert "Add condition to wildcard route"
  Downgrade jQuery for Ember Views
  adds spec for update links
  corrects the post url of the update links
  try again
  try again
  try again
  put expectations inside within block
  try relooking up record, maybe travis doesnt want to reload
  fixed locally broken specs
  fixes button overlapping nav
  put back gem needed for ckeditor
  trying to fix random broken spec
  attempts to fix broken text editor
  Add codeclimate badge to README
  Remove circle.yml
  Add .travis.yml
  ...

Conflicts:
	Gemfile.lock
Update README Setup section
Merge remote-tracking branch 'origin/master' into logger

* origin/master:
  Fix specs to use deep linking
  Add WebsiteIndexController
  Rename WebsiteIndexController to expected WebsiteController
  Revert "Add condition to wildcard route"
  Downgrade jQuery for Ember Views
  adds spec for update links
  corrects the post url of the update links
  try again
  try again
  try again
  put expectations inside within block
  try relooking up record, maybe travis doesnt want to reload
  fixed locally broken specs
  fixes button overlapping nav
  put back gem needed for ckeditor
  trying to fix random broken spec
  attempts to fix broken text editor
Merge pull request #296 from G5/auth_redux

Authentication
Merge pull request #351 from G5/logger

Add logger to static website compiler
Merge master and fix conflicts