Added haml and simple_form gems, updated views
Merge branch 'haml_and_simple_form' into davwards_083113
Clean up format in basic_workflow_spec
Run rspec in dev environment for generators

The rspec gem needs to run in the development
environment for rails to create test files
properly when generating models/controllers/etc

Also added pry for debugging.
Feature spec to add asset after faction create
Add Asset model
Add controller, views for Assets
Faction create view lists assets
Merge branch 'create_asset_on_faction' into davwards_083113
Gemfile.lock updated with pry dependencies
Merge pull request #2 from darrinkatz/davwards_083113

Davwards 083113