App seems to be working okay on django 1.5 now
Merge branch 'master' of github.com:underbluewaters/pyrifera
Hiding bookmark functionality
Merge branch 'master' of github.com:underbluewaters/pyrifera