Mock urllib2.urlopen to use local files; Potentially reduces test times from ~120 seconds to ~5 [MJ-247]
Add testfixtures library to simplify method mocking [MJ-247

It's the same number of lines, but it explicitly shows what is going on.
Improves handling of read_file; Replaces base urllib2.urlopen [MJ-247]
Update mysearch model tests to use testfixtures [MJ-247]
Merge branch 'master' into tests-slow-network-access__MJ-247
Prevent profile items from being hidden upon edit [MJ-248]
Merge branch 'master' into profile-edit-hides-item__MJ-248

Conflicts:
	templates/includes/form-error-highlight.html
Fix styling of delete/disable account modals [MJ-249]
Delete/disable modals display properly at all resolutions [MJ-249]
Merge branch 'master' into account-modal-alignment__MJ-249
Merge branch 'master' into tests-slow-network-access__MJ-247
Remove unhelpful mocked method [MJ-247]
Merge pull request #143 from DirectEmployers/tests-slow-network-access__MJ-247

Tests - improves speed of tests doing network access - MJ-247
Merge pull request #142 from DirectEmployers/account-modal-alignment__MJ-249

Account - Disable/Delete account modals display properly - MJ-249
Merge pull request #140 from DirectEmployers/profile-edit-hides-item__MJ-248

Prevent profile items from being hidden upon edit [MJ-248]
Make captchas work with AJAX
Fix merge conflicts
Account settings js
Use bootstrap modals with delete and disable
Fix disable button on delete form modal