2013 stuff that was left
Merge pull request #672 from awolfs/master

2013 stuff that was left over removed