add specs for Token class
add notifications spec
fix notification spec and fix Notification.rescind
fix token spec
fix merge conflict
fix merge conflict
improve specs for merge
make dbconsole executable
Merge branch 'master' of https://github.com/JoshuaJWilborn/better into JoshuaJWilborn-master
add heckle_me to notification#rescind
Merge branch 'master' of https://github.com/JoshuaJWilborn/better into JoshuaJWilborn-master
removed should be_present from token spec which was causing failed spec
Merge branch 'master' of https://github.com/JoshuaJWilborn/better into JoshuaJWilborn-master
Merge pull request #15 from JoshuaJWilborn/master

add specs for Token and Notification
Merge branch 'master' into JoshuaJWilborn-master
Merge branch 'master' of https://github.com/mockdeep/better
Merge branch 'master' into testing
fixed wiki#find_or_new_page model spec