User cleanup
Added spork for faster testing
code cleanup
more specs
refactor
DRY
code cleanup