Copyright 2013

Ready for next release.
Rakefile replaces Makefile
Merge branch 'develop'