1.5.3 release and 1.6.0 release 

This PR is actually two releases, once it's merged I'll deploy to the forge, lots of updates, I didn't PR the 1.5.3 release because travis had some issues with the nokogiri gem thats installed for beaker. The 1.6.0 release also closes issue #49 as well as a couple of other bugs.