Merge branch 'master' of github.com:nodu/trackr

Conflicts:
	Rakefile
Merge branch 'master' of github.com:nodu/trackr