Removing Lars' avatar logic in controller. Uncommenting dev pclip config.
Commenting out paperclip command config.
Fixed conflicts