added factory girl and updated models/tree_spec
deleted user spec since we rely on devise for user model
all of the rspec tests pass. writing additional tests now.
cleaned up some code
Merge branch 'master' into test