App now better understands SSL

Still a long way from finished, but now analytics (Omniture) understands http and https

Images now understand https

During local development the nginx will now forward the X-Forwarded-Proto header like an ELB does
mERGE BRAnch 'master' of github.com:guardian/frontend into ssl-preview
Separate Tag Types for IM Ad Slot
Add Tone Targeting to Ad Calls
Comment count is tonal
Merge branch 'master' into kc-contributor-im
Fix expected height of header in features container
Put item__link and tags into the title fragment
Show tags in fromage pattern
Show tags in baguette pattern
Show tags in saucisson pattern
Show tags and hide icon in picks container /cc @jamesgorrie
Merge branch 'master' of github.com:guardian/frontend into ssl-preview
Merge branch 'master' of github.com:guardian/frontend into tags-in-headlines

Conflicts:
	common/app/views/fragments/items/standard.scala.html
tab - spaces - tab - spaces
seriously
Avoid Duplication in Inline Merchandising Tags

Using sets instead of seqs because order is not significant
for this matching.
Use Same Method for Contributors and Tones

As they're built identically.
Use Lodash Map

For cross-browser compatibility.
Merge branch 'master' into kc-tone

Conflicts:
	common/app/assets/javascripts/modules/commercial/dfp.js