diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
index dfabe80e..106ae552 100644
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
@@ -61,7 +61,8 @@
       ".cpp",
       ".h",
       ".hpp",
-      ".inl"
+      ".inl",
+      ".ipp"
     ],
     "Ceylon": [
       ".ceylon"
@@ -702,8 +703,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 607168,
-  "languages_total": 739,
+  "tokens_total": 609432,
+  "languages_total": 740,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -9853,23 +9854,23 @@
     "C++": {
       "class": 40,
       "Bar": 2,
-      "{": 629,
+      "{": 726,
       "protected": 4,
       "char": 127,
       "*name": 6,
-      ";": 2564,
+      ";": 2783,
       "public": 33,
-      "void": 226,
+      "void": 241,
       "hello": 2,
-      "(": 2853,
-      ")": 2855,
-      "}": 629,
-      "//": 292,
+      "(": 3102,
+      ")": 3105,
+      "}": 726,
+      "//": 315,
       "///": 843,
       "mainpage": 1,
       "C": 6,
       "library": 14,
-      "for": 98,
+      "for": 105,
       "Broadcom": 3,
       "BCM": 14,
       "as": 28,
@@ -9918,7 +9919,7 @@
       "SPI": 44,
       "I2C": 29,
       "accessing": 2,
-      "system": 9,
+      "system": 13,
       "timers.": 1,
       "Pin": 65,
       "event": 3,
@@ -9929,13 +9930,13 @@
       "interrupts": 1,
       "are": 36,
       "not": 29,
-      "+": 70,
+      "+": 80,
       "compatible": 1,
       "installs": 1,
       "header": 7,
       "file": 31,
       "non": 2,
-      "-": 360,
+      "-": 438,
       "shared": 2,
       "any": 23,
       "Linux": 2,
@@ -9953,7 +9954,7 @@
       "of": 215,
       "package": 1,
       "that": 36,
-      "this": 55,
+      "this": 57,
       "documentation": 3,
       "refers": 1,
       "be": 35,
@@ -10027,7 +10028,7 @@
       "determined": 1,
       "suspect": 1,
       "an": 23,
-      "interrupt": 1,
+      "interrupt": 3,
       "handler": 1,
       "hitting": 1,
       "hard": 1,
@@ -10105,7 +10106,7 @@
       "Ennnnnn": 1,
       "available": 6,
       "nnnnnn.": 1,
-      "base": 6,
+      "base": 8,
       "registers": 12,
       "following": 2,
       "externals": 1,
@@ -10177,7 +10178,7 @@
       "SPI.": 1,
       "While": 1,
       "able": 2,
-      "state": 22,
+      "state": 33,
       "through": 4,
       "bcm2835_spi_gpio_write": 1,
       "bcm2835_spi_end": 4,
@@ -10198,7 +10199,7 @@
       "referred": 1,
       "I": 4,
       "//en.wikipedia.org/wiki/I": 1,
-      "%": 6,
+      "%": 7,
       "C2": 1,
       "B2C": 1,
       "V2": 2,
@@ -10211,7 +10212,7 @@
       "user": 3,
       "i.e.": 1,
       "they": 2,
-      "run": 1,
+      "run": 2,
       "Such": 1,
       "part": 1,
       "kernel": 4,
@@ -10219,7 +10220,7 @@
       "subject": 1,
       "paging": 1,
       "swapping": 2,
-      "while": 13,
+      "while": 17,
       "does": 4,
       "things": 1,
       "besides": 1,
@@ -10239,7 +10240,7 @@
       "guarantee": 1,
       "bcm2835_delay": 5,
       "bcm2835_delayMicroseconds": 6,
-      "return": 221,
+      "return": 240,
       "exactly": 2,
       "requested.": 1,
       "fact": 2,
@@ -10264,11 +10265,11 @@
       "reports": 1,
       "prevent": 4,
       "fragment": 2,
-      "struct": 12,
+      "struct": 13,
       "sched_param": 1,
       "sp": 4,
       "memset": 3,
-      "&": 161,
+      "&": 203,
       "sizeof": 15,
       "sp.sched_priority": 1,
       "sched_get_priority_max": 1,
@@ -10276,7 +10277,7 @@
       "sched_setscheduler": 1,
       "mlockall": 1,
       "MCL_CURRENT": 1,
-      "|": 19,
+      "|": 40,
       "MCL_FUTURE": 1,
       "Open": 2,
       "Source": 2,
@@ -10284,7 +10285,7 @@
       "GPL": 2,
       "appropriate": 7,
       "option": 1,
-      "if": 316,
+      "if": 359,
       "want": 5,
       "share": 2,
       "source": 12,
@@ -10395,7 +10396,7 @@
       "need": 6,
       "link": 3,
       "version.": 1,
-      "s": 24,
+      "s": 26,
       "doc": 1,
       "Also": 1,
       "added": 2,
@@ -10429,7 +10430,7 @@
       "compiles": 1,
       "even": 2,
       "CLOCK_MONOTONIC_RAW": 1,
-      "CLOCK_MONOTONIC": 1,
+      "CLOCK_MONOTONIC": 3,
       "instead.": 1,
       "errors": 1,
       "divider": 15,
@@ -10477,7 +10478,7 @@
       "olly.": 1,
       "Patch": 2,
       "Dootson": 2,
-      "close": 3,
+      "close": 7,
       "/dev/mem": 4,
       "granted.": 1,
       "susceptible": 1,
@@ -10504,7 +10505,7 @@
       "completing.": 1,
       "Patched": 1,
       "p": 6,
-      "[": 276,
+      "[": 293,
       "atched": 1,
       "his": 1,
       "submitted": 1,
@@ -10533,10 +10534,10 @@
       "DIRECTLY": 1,
       "USE": 1,
       "LISTS": 1,
-      "#ifndef": 28,
+      "#ifndef": 29,
       "BCM2835_H": 3,
-      "#define": 342,
-      "#include": 121,
+      "#define": 343,
+      "#include": 129,
       "<stdint.h>": 2,
       "defgroup": 7,
       "constants": 1,
@@ -10546,16 +10547,16 @@
       "here": 1,
       "@": 14,
       "HIGH": 12,
-      "true": 41,
+      "true": 49,
       "volts": 2,
       "pin.": 21,
-      "false": 45,
+      "false": 48,
       "Speed": 1,
       "core": 1,
       "clock": 21,
       "core_clk": 1,
       "BCM2835_CORE_CLK_HZ": 1,
-      "<": 250,
+      "<": 255,
       "Base": 17,
       "Address": 10,
       "BCM2835_PERI_BASE": 9,
@@ -10580,7 +10581,7 @@
       "bcm2835_init": 11,
       "extern": 72,
       "volatile": 13,
-      "uint32_t": 37,
+      "uint32_t": 39,
       "*bcm2835_st": 1,
       "*bcm2835_gpio": 1,
       "*bcm2835_pwm": 1,
@@ -10594,7 +10595,7 @@
       "page": 5,
       "BCM2835_PAGE_SIZE": 1,
       "*1024": 2,
-      "block": 4,
+      "block": 7,
       "BCM2835_BLOCK_SIZE": 1,
       "offsets": 2,
       "BCM2835_GPIO_BASE.": 1,
@@ -10969,10 +10970,10 @@
       "BCM2835_BSC_C_READ": 1,
       "BCM2835_BSC_S_CLKT": 1,
       "stretch": 1,
-      "timeout": 1,
+      "timeout": 5,
       "BCM2835_BSC_S_ERR": 1,
       "ACK": 1,
-      "error": 2,
+      "error": 8,
       "BCM2835_BSC_S_RXF": 1,
       "BCM2835_BSC_S_TXE": 1,
       "TXE": 1,
@@ -11003,7 +11004,7 @@
       "BCM2835_I2C_REASON_ERROR_CLKT": 1,
       "BCM2835_I2C_REASON_ERROR_DATA": 1,
       "sent": 1,
-      "/": 15,
+      "/": 16,
       "BCM2835_ST_CS": 1,
       "Control/Status": 1,
       "BCM2835_ST_CLO": 1,
@@ -11044,7 +11045,7 @@
       "BCM2835_PWM0_SERIAL": 1,
       "BCM2835_PWM0_ENABLE": 1,
       "x": 86,
-      "#endif": 98,
+      "#endif": 110,
       "#ifdef": 19,
       "__cplusplus": 12,
       "init": 2,
@@ -11062,7 +11063,7 @@
       "bcm2835_set_debug": 2,
       "fails": 1,
       "returning": 1,
-      "result": 2,
+      "result": 8,
       "crashes": 1,
       "failures.": 1,
       "Prints": 1,
@@ -11071,12 +11072,12 @@
       "case": 34,
       "errors.": 1,
       "successful": 2,
-      "else": 50,
-      "int": 192,
+      "else": 58,
+      "int": 218,
       "Close": 1,
       "deallocating": 1,
       "allocated": 2,
-      "closing": 1,
+      "closing": 3,
       "Sets": 24,
       "debug": 6,
       "prevents": 1,
@@ -11092,7 +11093,7 @@
       "operation.": 2,
       "Call": 2,
       "param": 72,
-      "]": 275,
+      "]": 292,
       "level.": 3,
       "uint8_t": 43,
       "lowlevel": 2,
@@ -11166,7 +11167,7 @@
       "Tests": 1,
       "detected": 7,
       "requested": 1,
-      "flag": 1,
+      "flag": 3,
       "bcm2835_gpio_set_eds": 2,
       "status": 1,
       "th": 1,
@@ -11268,7 +11269,7 @@
       "Forces": 2,
       "ALT0": 2,
       "funcitons": 1,
-      "complete": 2,
+      "complete": 3,
       "End": 2,
       "returned": 5,
       "INPUT": 2,
@@ -11320,7 +11321,7 @@
       "placed": 1,
       "rbuf.": 1,
       "rbuf": 3,
-      "long": 14,
+      "long": 15,
       "tbuf": 4,
       "Buffer": 10,
       "send.": 5,
@@ -11364,8 +11365,8 @@
       "course": 2,
       "nothing": 1,
       "driver": 1,
-      "const": 170,
-      "*": 177,
+      "const": 172,
+      "*": 183,
       "receive.": 2,
       "received.": 2,
       "Allows": 2,
@@ -11411,8 +11412,8 @@
       "<string>": 4,
       "<vector>": 4,
       "<fstream>": 2,
-      "namespace": 32,
-      "std": 52,
+      "namespace": 38,
+      "std": 53,
       "DEFAULT_DELIMITER": 1,
       "CsvStreamer": 5,
       "private": 16,
@@ -11460,7 +11461,7 @@
       "leading/trailing": 1,
       "spaces": 3,
       "trimmed": 1,
-      "bool": 105,
+      "bool": 111,
       "Like": 1,
       "specify": 1,
       "trim": 2,
@@ -11477,7 +11478,7 @@
       "<QCoreApplication>": 1,
       "<QString>": 1,
       "<QVariantMap>": 2,
-      "static": 262,
+      "static": 263,
       "Env": 13,
       "*env_instance": 1,
       "NULL": 109,
@@ -11509,6 +11510,202 @@
       "<QObject>": 1,
       "Q_OBJECT": 1,
       "*instance": 1,
+      "BOOST_ASIO_DETAIL_IMPL_EPOLL_REACTOR_IPP": 3,
+      "#if": 63,
+      "defined": 49,
+      "_MSC_VER": 7,
+      "&&": 29,
+      "<boost/asio/detail/config.hpp>": 1,
+      "BOOST_ASIO_HAS_EPOLL": 2,
+      "<cstddef>": 1,
+      "<sys/epoll.h>": 1,
+      "<boost/asio/detail/epoll_reactor.hpp>": 1,
+      "<boost/asio/detail/throw_error.hpp>": 1,
+      "<boost/asio/error.hpp>": 1,
+      "BOOST_ASIO_HAS_TIMERFD": 19,
+      "<boost/asio/detail/push_options.hpp>": 1,
+      "boost": 18,
+      "asio": 14,
+      "detail": 5,
+      "epoll_reactor": 40,
+      "io_service": 6,
+      "service_base": 1,
+      "<epoll_reactor>": 1,
+      "io_service_": 1,
+      "use_service": 1,
+      "<io_service_impl>": 1,
+      "mutex_": 13,
+      "interrupter_": 5,
+      "epoll_fd_": 20,
+      "do_epoll_create": 3,
+      "timer_fd_": 21,
+      "do_timerfd_create": 3,
+      "shutdown_": 10,
+      "epoll_event": 10,
+      "ev": 21,
+      "ev.events": 13,
+      "EPOLLIN": 8,
+      "EPOLLERR": 8,
+      "EPOLLET": 5,
+      "ev.data.ptr": 10,
+      "epoll_ctl": 12,
+      "EPOLL_CTL_ADD": 7,
+      "interrupter_.read_descriptor": 3,
+      "interrupter_.interrupt": 2,
+      "shutdown_service": 1,
+      "mutex": 16,
+      "scoped_lock": 16,
+      "lock": 5,
+      "lock.unlock": 1,
+      "op_queue": 6,
+      "<operation>": 6,
+      "ops": 10,
+      "descriptor_state*": 6,
+      "registered_descriptors_.first": 2,
+      "i": 106,
+      "max_ops": 6,
+      "ops.push": 5,
+      "op_queue_": 12,
+      "registered_descriptors_.free": 2,
+      "timer_queues_.get_all_timers": 1,
+      "io_service_.abandon_operations": 1,
+      "fork_service": 1,
+      "fork_event": 1,
+      "fork_ev": 2,
+      "fork_child": 1,
+      "interrupter_.recreate": 1,
+      "update_timeout": 2,
+      "descriptors_lock": 3,
+      "registered_descriptors_mutex_": 3,
+      "next_": 3,
+      "registered_events_": 8,
+      "descriptor_": 5,
+      "error_code": 4,
+      "ec": 6,
+      "errno": 10,
+      "get_system_category": 3,
+      "throw_error": 2,
+      "init_task": 1,
+      "io_service_.init_task": 1,
+      "register_descriptor": 1,
+      "socket_type": 7,
+      "descriptor": 15,
+      "per_descriptor_data": 8,
+      "descriptor_data": 60,
+      "allocate_descriptor_state": 3,
+      "descriptor_lock": 7,
+      "reactor_": 7,
+      "EPOLLHUP": 3,
+      "EPOLLPRI": 3,
+      "register_internal_descriptor": 1,
+      "op_type": 8,
+      "reactor_op*": 5,
+      "op": 28,
+      ".push": 2,
+      "move_descriptor": 1,
+      "target_descriptor_data": 2,
+      "source_descriptor_data": 3,
+      "start_op": 1,
+      "is_continuation": 5,
+      "allow_speculative": 2,
+      "ec_": 4,
+      "bad_descriptor": 1,
+      "post_immediate_completion": 2,
+      ".empty": 5,
+      "read_op": 1,
+      "||": 19,
+      "except_op": 1,
+      "perform": 2,
+      "descriptor_lock.unlock": 4,
+      "io_service_.post_immediate_completion": 2,
+      "write_op": 2,
+      "EPOLLOUT": 4,
+      "EPOLL_CTL_MOD": 3,
+      "io_service_.work_started": 2,
+      "cancel_ops": 1,
+      ".front": 3,
+      "operation_aborted": 2,
+      ".pop": 3,
+      "io_service_.post_deferred_completions": 3,
+      "deregister_descriptor": 1,
+      "EPOLL_CTL_DEL": 2,
+      "free_descriptor_state": 3,
+      "deregister_internal_descriptor": 1,
+      "get_timeout": 5,
+      "events": 8,
+      "num_events": 2,
+      "epoll_wait": 1,
+      "check_timers": 6,
+      "#else": 35,
+      "void*": 2,
+      "ptr": 6,
+      ".data.ptr": 1,
+      "static_cast": 14,
+      "<descriptor_state*>": 2,
+      "set_ready_events": 1,
+      ".events": 1,
+      "common_lock": 1,
+      "timer_queues_.get_ready_timers": 1,
+      "itimerspec": 5,
+      "new_timeout": 6,
+      "old_timeout": 4,
+      "flags": 4,
+      "timerfd_settime": 2,
+      "EPOLL_CLOEXEC": 4,
+      "fd": 15,
+      "epoll_create1": 1,
+      "EINVAL": 4,
+      "ENOSYS": 1,
+      "epoll_create": 1,
+      "epoll_size": 1,
+      "fcntl": 2,
+      "F_SETFD": 2,
+      "FD_CLOEXEC": 2,
+      "timerfd_create": 2,
+      "TFD_CLOEXEC": 1,
+      "registered_descriptors_.alloc": 1,
+      "do_add_timer_queue": 1,
+      "timer_queue_base": 2,
+      "queue": 4,
+      "timer_queues_.insert": 1,
+      "do_remove_timer_queue": 1,
+      "timer_queues_.erase": 1,
+      "timer_queues_.wait_duration_msec": 1,
+      "ts": 1,
+      "ts.it_interval.tv_sec": 1,
+      "ts.it_interval.tv_nsec": 1,
+      "usec": 5,
+      "timer_queues_.wait_duration_usec": 1,
+      "ts.it_value.tv_sec": 1,
+      "ts.it_value.tv_nsec": 1,
+      "TFD_TIMER_ABSTIME": 1,
+      "perform_io_cleanup_on_block_exit": 4,
+      "explicit": 5,
+      "epoll_reactor*": 2,
+      "r": 38,
+      "first_op_": 3,
+      "ops_.empty": 1,
+      "ops_": 2,
+      "operation*": 4,
+      "descriptor_state": 5,
+      "operation": 2,
+      "do_complete": 2,
+      "perform_io": 2,
+      "mutex_.lock": 1,
+      "io_cleanup": 1,
+      "adopt_lock": 1,
+      "j": 10,
+      "io_cleanup.ops_.push": 1,
+      "break": 35,
+      "io_cleanup.first_op_": 2,
+      "io_cleanup.ops_.front": 1,
+      "io_cleanup.ops_.pop": 1,
+      "io_service_impl*": 1,
+      "owner": 3,
+      "size_t": 6,
+      "bytes_transferred": 2,
+      "<uint32_t>": 1,
+      "<boost/asio/detail/pop_options.hpp>": 1,
       "Field": 2,
       "Free": 1,
       "Black": 1,
@@ -11622,7 +11819,6 @@
       "*rr": 1,
       "*zero": 1,
       "n": 28,
-      "i": 83,
       "BN_CTX_start": 1,
       "BN_CTX_get": 8,
       "EC_GROUP_get_order": 1,
@@ -11630,7 +11826,6 @@
       "BN_mul_word": 1,
       "BN_add": 1,
       "ecsig": 3,
-      "r": 36,
       "EC_GROUP_get_curve_GFp": 1,
       "BN_cmp": 1,
       "R": 6,
@@ -11688,13 +11883,11 @@
       "nBitsR": 3,
       "BN_num_bits": 2,
       "nBitsS": 3,
-      "&&": 24,
       "nRecId": 4,
       "<4;>": 1,
       "keyRec": 5,
       "1": 4,
       "GetPubKey": 5,
-      "break": 34,
       "BN_bn2bin": 2,
       "/8": 2,
       "ECDSA_SIG_free": 2,
@@ -11722,7 +11915,6 @@
       "<stdexcept>": 1,
       "<openssl/ec.h>": 1,
       "runtime_error": 2,
-      "explicit": 4,
       "str": 2,
       "CKeyID": 5,
       "uint160": 8,
@@ -11741,7 +11933,6 @@
       "vchPubKey.begin": 1,
       "vchPubKey.end": 1,
       "vchPubKey.size": 3,
-      "||": 17,
       "IsCompressed": 2,
       "Raw": 1,
       "secure_allocator": 2,
@@ -11764,7 +11955,6 @@
       "//#define": 1,
       "DEBUG": 5,
       "dout": 2,
-      "#else": 31,
       "cerr": 1,
       "libcanister": 2,
       "//the": 8,
@@ -11871,7 +12061,6 @@
       "getFile": 1,
       "otherwise": 1,
       "overwrites": 1,
-      "operation": 1,
       "succeeded": 2,
       "writeFile": 2,
       "//get": 1,
@@ -11894,7 +12083,6 @@
       "dFlush": 1,
       "Q_OS_LINUX": 2,
       "<QApplication>": 1,
-      "#if": 52,
       "QT_VERSION": 1,
       "QT_VERSION_CHECK": 1,
       "#error": 9,
@@ -11956,7 +12144,6 @@
       "sse": 1,
       "cvttss2si": 2,
       "OG_ASM_MSVC": 4,
-      "defined": 23,
       "OG_FTOI_USE_SSE": 2,
       "SysInfo": 2,
       "cpu.general.SSE": 2,
@@ -11974,7 +12161,6 @@
       "cast": 7,
       "why": 3,
       "did": 3,
-      "static_cast": 11,
       "<int>": 3,
       "FtoiFast": 2,
       "Ftol": 1,
@@ -12052,7 +12238,6 @@
       "edx": 2,
       "fstp": 2,
       "dword": 2,
-      "ptr": 2,
       "asm": 1,
       "Deg2Rad": 1,
       "DEG_TO_RAD": 1,
@@ -12191,7 +12376,6 @@
       "OnShutdown": 1,
       "StaticDescriptorInitializer_protocol_2dbuffer_2eproto": 2,
       "static_descriptor_initializer_protocol_2dbuffer_2eproto_": 1,
-      "_MSC_VER": 3,
       "kNameFieldNumber": 2,
       "Message": 7,
       "SharedCtor": 4,
@@ -12204,7 +12388,6 @@
       "SetCachedSize": 2,
       "GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN": 2,
       "GOOGLE_SAFE_CONCURRENT_WRITES_END": 2,
-      "descriptor": 2,
       "*default_instance_": 1,
       "Person*": 7,
       "xffu": 3,
@@ -12240,7 +12423,6 @@
       "SERIALIZE": 2,
       "WriteString": 1,
       "unknown_fields": 7,
-      ".empty": 3,
       "SerializeUnknownFields": 1,
       "uint8*": 4,
       "SerializeWithCachedSizesToArray": 2,
@@ -12295,7 +12477,6 @@
       "UnknownFieldSet*": 1,
       "GetCachedSize": 1,
       "clear_name": 2,
-      "size_t": 5,
       "release_name": 2,
       "set_allocated_name": 2,
       "set_has_name": 7,
@@ -12726,7 +12907,6 @@
       "c0_": 64,
       "d": 8,
       "HexValue": 2,
-      "j": 4,
       "PushBack": 8,
       "Advance": 44,
       "STATIC_ASSERT": 5,
@@ -12747,7 +12927,6 @@
       "BIT_NOT": 2,
       "Next": 3,
       "current_": 2,
-      "next_": 2,
       "has_multiline_comment_before_next_": 5,
       "token": 64,
       "<Token::Value>": 1,
@@ -13002,7 +13181,6 @@
       "QtMsgType": 1,
       "dump_path": 1,
       "minidump_id": 1,
-      "void*": 1,
       "context": 8,
       "QVariant": 1,
       "coffee2js": 1,
@@ -13075,7 +13253,6 @@
       "FLAG_random_seed": 2,
       "val": 3,
       "ScopedLock": 1,
-      "lock": 1,
       "entropy_mutex.Pointer": 1,
       "random": 1,
       "random_base": 3,
@@ -13184,7 +13361,6 @@
       "PY_VERSION_HEX": 9,
       "METH_COEXIST": 1,
       "PyDict_CheckExact": 1,
-      "op": 6,
       "Py_TYPE": 4,
       "PyDict_Type": 1,
       "PyDict_Contains": 1,
@@ -65501,7 +65677,7 @@
     "Brightscript": 579,
     "C": 59053,
     "C#": 278,
-    "C++": 32475,
+    "C++": 34739,
     "Ceylon": 50,
     "Cirru": 244,
     "Clojure": 510,
@@ -65682,7 +65858,7 @@
     "Brightscript": 1,
     "C": 29,
     "C#": 2,
-    "C++": 28,
+    "C++": 29,
     "Ceylon": 1,
     "Cirru": 9,
     "Clojure": 7,
@@ -65845,5 +66021,5 @@
     "YAML": 2,
     "Zephir": 2
   },
-  "md5": "dfced8ef9ddd9813d2982dc25a5468fa"
+  "md5": "f4510eb529137f1b68e1dfc1b11b05d4"
 }
\ No newline at end of file