some things that have been added
Merge branch 'master' of github.com:unfiltered/unfiltered