Merge pull request #25 from smcgregor/master

Remove deprecated functionality and maintain code context of new links