Updated for version 4.0

* Changed several function names to make them more intuitive.
* Pass more arguments through shortcode for greater flexibility.
* Breaks backwards compatabitility with versions 3.x.