update wiki submodule pointer
Merge branch '55_notification_rules' of github.com:jessereynolds/flapjack into 55_notification_rules
move json_spec to testing group in Gemfile
more API test coverage
improve web/api tests to run in EM blocks, further API test coverage
Merge branch '55_notification_rules' of github.com:jessereynolds/flapjack into 55_notification_rules
alter API for /contacts/:contact_id/notification_rules to return full rules
add pending specs
Merge branch '55_notification_rules' of github.com:jessereynolds/flapjack into 55_notification_rules
minor bugfixes for API functions after testing
test fixes
revert broken async testing stuff, fix masked test failures
Merge pull request #8 from ali-graham/55_notification_rules

A few API bugfixes and more implemented tests