Cleanup namespacing issues #3
Merge branch 'master' of github.com-home:SkylarKelty/Rapid