Merge pull request #61 from ehoch/2-2-stable

pretty up registration page
switch from kaminari-bootstrap to bootstrap-kaminari-views
Merge pull request #63 from alepore/kaminari_fix

switch from kaminari-bootstrap to bootstrap-kaminari-views