Changing form 'software' to 'development' because it just doesn't look right the other way.
Merge branch 'master' of github.com:lightcastle/djangowebsite