0.5

@wesokes I'm merging 0.5 into develop so it can go up into master. I had issues specifying querybuilder as a dependency_link in my other package since the tags referenced the 0.5 branch.