Udpate structure och make it more clear to read.
Merge branch 'master' of github.com:vinkla/wordpress

* 'master' of github.com:vinkla/wordpress:
  Change wp_trim_excerpt to excerpt_more and update return.
Remove image size 500, add back when accutally needed.