Clean up code and tidy up ready so that accept default rules can work.
Some trivial code tidy left over from the merges.
Minor typo fixes.
Code review markups.
Merge pull request #44 from Metaswitch/issue39

Fix for https://github.com/Metaswitch/calico/issues/39