2014 Style update
Merge pull request #12 from adammeyer/master

2014 Style update