Merge pull request #14 from bitsculpt/david

Made User Sign in Acceptance tests green
merge
merge
Merge pull request #15 from bitsculpt/dan-branch

Dan branch
Added bootstrap
missed stuff
Merge pull request #16 from bitsculpt/dan-branch

Bootstrap
Factory fixes. Cluster acceptance tests.
Merge pull request #17 from bitsculpt/dan-branch

Factory fixes. Cluster acceptance tests.
Planets acceptance tests.
Merge pull request #18 from bitsculpt/dan-branch

Planets acceptance tests.
gemfile change
gemfile fix for heroku
Cause YOLO.
Merge branch 'master' into david