Initial work.
Small styling changes.
Merge branch 'master' of github.com:jonursenbach/peanut-butter