added some optional fields we should be covering
odd issue occured when pulling down changes
Merge branch 'master' of https://github.com/dirk/hipster

Conflicts:
	README.md