Code standards cleanup.
Merge branch 'master' of github.com:jpoesen/field_collection_tokens