Rename folders to be plural because it bothers me..

Following the leader on this convention.
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop