committed the rest
Merge branch 'master' of http://github.com/BoxmodelTim/Site