Add server items and merge .rvmrc
Merge branch 'master' of github.com:tatums/antiques
removed some comments
Configuring Solr
switch to fog
changing config env settings
reconfig mail env
comit deleted mail file
Upgrade rails to 3.2.11
remove unused tests
merge
set carrierwave for env
Merge branch 'develop'
stuff
clean up create sessions
wip removing solar search
add pg_search
add carrierwave settings for S3
s3 tweaking
s3 tweaking