bug fixes
cleaning up friendship interactions
setting up blocking logic
indenation
added missing comma
state machine rails 4.1 hack
fixing variables
fixing bugs
tweaking tests and fixing syntax errors