Fixing issue #10 & refactoring media breakpoints

See http://tzi.fr/CSS/Responsive/Prevent-double-breakpoint for media
breakpoint refactoring info.