Fixing poop from previous merges..

Cherry picking that shit
Fixing merge shit from previous.. merge.
Merge branch '3.0/develop' of github.com:RyanThompson/pyrocms into 3.0/develop