Merge pull request #2 from maebeale/master

merge spec file conflicts.
add welcome index to routes
removed the welcome route
Add role, remove is_admin
Adjust seeds to reflect STI changes
Solved merge conflict with user_controller_spec
generate welcome controller. change welcome index to html only. set root route to welcome#index
merge STI and factories changes.