Merge pull request #4 from davemerritt/master

sync master branches
capybara working, invitation authorization bug fixed
increment paperclip version
Merge branch 'master' of github.com:erichwelz/homebass
Merge branch 'mail_authorization'
Feature Complete
wip: cleaning views
removing unused asset
user show cleanup
wip: nesting resources
authorization for invitation show
Merge branch 'master' into views-cleanup
Bring branch up to date
user show better flow
panel for bio on user-show
text area default size
refactor css
refactor css
Update index.html.erb
Merge pull request #5 from erichwelz/views-cleanup

Views cleanup
Merge pull request #10 from erichwelz/master

sync master branches