State pension calculator fixes

Further changes related to: https://www.pivotaltracker.com/story/show/69528248

Date calculation bug fix by @heathd 
Reverted state pension age calculation and fixed outstanding bug.
Updated content.
Additional test coverage.