fixed NSAttributedString specs
hmm, travisci is being funny about 'rvm use 1.9.3'
Merge branch 'master' into 1.0

Conflicts:
	Gemfile.lock