Initial pull for feature-bottles

I fixed 2, 3, and 4, and think I fixed 5 unintentionally at least if I understand what your saying. I'll put a pull request in for the branch you named here shortly.

As for 1: I only pulled the fields that really didn't make any since to me. I agree with most of your fields and am indifferent to the others and could see them being useful for some people

As for 6: totally agree, but for the record I suck at UCD and was taking the fastest path forward. It could be that just removing the logo's is actually whats appropriate.

Would you like me to continue developing in my own repo and issuing pull requests on occasion?