Merge pull request #3 from karelia/placeholder-warning

Fix warning by implementing -placeholder
Add white space between methods
Merge branch 'insertion-marker' of git://github.com/karelia/CSNPlaceholderTextView into karelia-insertion-marker
Merge branch 'karelia-insertion-marker'
Bump Version
Merge remote-tracking branch 'upstream/master'
Offset placeholder slightly from caret