Ugghh... outdated commits from fixing things awhile ago and not saving then...
Merge branches 'master' and 'development' of github.com:socialigniter/socialigniter into development