Update to 2014
Merge pull request #12 from cyberchimps/dev

Update to 2014