2014 updates

2014 updates.

**warning**: Do not merge until 01/01/14. Otherwise, this represents a breaking change.