FEATURE: allow inline disposition on uploads

when linking an upload allow ?inline=1 to display upload inline
pull in latest arel
update rails master