Merge remote-tracking branch 'upstream/master'

Conflicts:
	REComposeViewController/REComposeViewController.m
Add .gitignore
Strip trailing whitespace
Refactor